Michael Niedermayer cdafcf838c 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@gmx.at>

2013-04-04 13:41:01 +02:00

25 KiB

Raw Blame History

View Raw