Merge commit '46c477c2a14b04a63ab11d31003b48fab6146a96' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:26:06 +0000 (22:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:26:06 +0000 (22:26 +0200)
commit0d901439729c073e79c3edae57ec0dff22fb64c5
tree77d5d44efdc196ce1bd57db11d18dda3d5745ed8
parent00049f193d07cec0409069bc51d0dcb8ab9da837
parent46c477c2a14b04a63ab11d31003b48fab6146a96
Merge commit '46c477c2a14b04a63ab11d31003b48fab6146a96' into release/2.2

* commit '46c477c2a14b04a63ab11d31003b48fab6146a96':
  Check mp3 header before calling avpriv_mpegaudio_decode_header().

Conflicts:
libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libmp3lame.c
libavformat/mp3enc.c