OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0a5f71 3f78f09)
Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Mar 2013 01:21:00 +0000 (02:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Mar 2013 01:21:04 +0000 (02:21 +0100)
* cehoyos/master:
  Revert "build: disable iconv by default."

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

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