OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a58d5f d68dc3c)
Merge commit 'd68dc3c9446e38b4d686cc0f55433c9e8d7c128b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 16:25:52 +0000 (17:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 16:26:40 +0000 (17:26 +0100)
* commit 'd68dc3c9446e38b4d686cc0f55433c9e8d7c128b':
  drawtext: Drop pointless header

See: cea5812fa723c08b89d929eeba73462e05de2973
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help