diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 12:50:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 12:52:20 +0200 |
| commit | cf7f798984a9d93a2297ecbf203b85a660317e31 (patch) | |
| tree | 6be5b7a71fe092dd42a4b22206daad9a95eeabcf /cmdutils.c | |
| parent | 244a58fff0adabcce3f9ea80d848a562ff377843 (diff) | |
| parent | d7dbc687e312a91ef2ccf797d57b95c61d0e8a2f (diff) | |
| download | ffmpeg-cf7f798984a9d93a2297ecbf203b85a660317e31.tar.gz | |
Merge commit 'd7dbc687e312a91ef2ccf797d57b95c61d0e8a2f' into release/1.1
* commit 'd7dbc687e312a91ef2ccf797d57b95c61d0e8a2f':
Check mp3 header before calling avpriv_mpegaudio_decode_header().
Conflicts:
libavformat/mp3enc.c
See: See: 2dd0da787ce5008d4d1b8f461fbd1288c32e2c38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions