OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 523c8e0 3586280)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Mar 2013 16:43:43 +0000 (17:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Mar 2013 16:43:43 +0000 (17:43 +0100)
commit330e440706665d91f36f180f25fa096a8b3e7ed4
treeca9e7fe58b74cc4d7f9ad04427faff8a311ff40dtree | snapshot
parent523c8e0503dcf99f67ea909dea2ca5e56d9ff091commit | diff
parent358628074c314c8ec6d433a740e9176e7aefa124commit | diff
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  print_options: do not generate docs for options without enc or dec flags
  mpeg12: do not fail on zero dimensions in the sequence header.

Conflicts:
libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/print_options.c diff1 | diff2 | blob | history
libavcodec/mpeg12.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help