aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg4videodec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-25 17:49:33 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-25 17:49:36 +0100
commitd1e2d59f23a9c69b0b088a9a528b29f20c2948c1 (patch)
tree1c7fb61eda9558303a46c593150dcfd07ced8485 /libavcodec/mpeg4videodec.c
parent205b2ba3d677330e023aac2f4bd3f624039256b9 (diff)
parent56ffde3f619076650bdc6003cc683cf2f563463f (diff)
downloadffmpeg-d1e2d59f23a9c69b0b088a9a528b29f20c2948c1.tar.gz
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Allow muxing h264 into ts with startcode "001" instead of "0001". lavfi/fade: Do not overread input buffer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
0 files changed, 0 insertions, 0 deletions