[FFmpeg-cvslog] Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'

Michael Niedermayer git at videolan.org
Mon Jun 23 03:43:16 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 03:34:13 2014 +0200| [ca350378de061a43d394dab2a649995f7f83274c] | committer: Michael Niedermayer

Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'

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

Conflicts:
	libavformat/mp3enc.c

See: 2dd0da787ce5008d4d1b8f461fbd1288c32e2c38
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list