aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpegvideodec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-23 03:34:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-23 03:34:13 +0200
commitca350378de061a43d394dab2a649995f7f83274c (patch)
treeb30092dc6dcd9d1b1600e184a9820b1c7ccef554 /libavformat/mpegvideodec.c
parent2bcf34a0ef60b8026d9f10fafda9b61ad302b85a (diff)
parentf2f2e7627f0c878d13275af5d166ec5932665e28 (diff)
downloadffmpeg-ca350378de061a43d394dab2a649995f7f83274c.tar.gz
Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'
* commit 'f2f2e7627f0c878d13275af5d166ec5932665e28': Check mp3 header before calling avpriv_mpegaudio_decode_header(). Conflicts: libavformat/mp3enc.c See: 2dd0da787ce5008d4d1b8f461fbd1288c32e2c38 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegvideodec.c')
0 files changed, 0 insertions, 0 deletions