[FFmpeg-cvslog] Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'

Michael Niedermayer git at videolan.org
Thu Apr 4 13:47:27 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  4 13:41:01 2013 +0200| [cdafcf838cc7f559b67863183ad1283c97a9ae70] | committer: Michael Niedermayer

Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'

* commit '8d617b11cfc87b2c6056fee029ac5bc760af874a':
  id3v2: pad the APIC packets as required by lavc.
  dfa: check for invalid access in decode_wdlt().

Conflicts:
	libavformat/id3v2.c

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

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





More information about the ffmpeg-cvslog mailing list