OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93cf43e 9fa75be)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 19:05:52 +0000 (20:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 19:23:58 +0000 (20:23 +0100)
* qatar/master:
  mpegts: add HEVC registration descriptor

Conflicts:
libavformat/mpegts.c

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

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