[FFmpeg-cvslog] Merge commit 'd7dbc687e312a91ef2ccf797d57b95c61d0e8a2f' into release/1.1

Michael Niedermayer git at videolan.org
Fri Aug 8 13:28:42 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 12:50:57 2014 +0200| [cf7f798984a9d93a2297ecbf203b85a660317e31] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf7f798984a9d93a2297ecbf203b85a660317e31
---





More information about the ffmpeg-cvslog mailing list