OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47eb15b fb5518c)
Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Dec 2013 14:44:39 +0000 (15:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Dec 2013 14:44:45 +0000 (15:44 +0100)
* cehoyos/master:
  Force one stream in caf muxer.

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

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