[FFmpeg-cvslog] Merge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'

Michael Niedermayer git at videolan.org
Thu Sep 12 14:20:32 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 12 14:10:17 2013 +0200| [ad9a877a6d77657e4aeab57eb2bddaa683a07fe5] | committer: Michael Niedermayer

Merge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'

* commit '459f2b393a3f89ed08d10fbceb4738d1429f268e':
  mpc8: Check the seek table size parsed from the bitstream

Conflicts:
	libavformat/mpc8.c

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

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





More information about the ffmpeg-cvslog mailing list