Merge commit 'd7dbc687e312a91ef2ccf797d57b95c61d0e8a2f' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 10:50:57 +0000 (12:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 10:52:20 +0000 (12:52 +0200)
commitcf7f798984a9d93a2297ecbf203b85a660317e31
tree6be5b7a71fe092dd42a4b22206daad9a95eeabcf
parent244a58fff0adabcce3f9ea80d848a562ff377843
parentd7dbc687e312a91ef2ccf797d57b95c61d0e8a2f
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>
libavcodec/libmp3lame.c
libavformat/mp3enc.c