[FFmpeg-cvslog] Merge commit '46c477c2a14b04a63ab11d31003b48fab6146a96' into release/2.2
Michael Niedermayer
git at videolan.org
Mon Jul 14 22:35:48 CEST 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 14 22:26:06 2014 +0200| [0d901439729c073e79c3edae57ec0dff22fb64c5] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d901439729c073e79c3edae57ec0dff22fb64c5
---
More information about the ffmpeg-cvslog
mailing list