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

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 13:35:30 2013 +0200| [a367ab657f29869d46ca57ce58251b02343a2b53] | committer: Michael Niedermayer

Merge commit '8f558c3e101859aec9adcb4b4b270ae1ef8f88b5' into release/1.1

* commit '8f558c3e101859aec9adcb4b4b270ae1ef8f88b5':
  af_channelmap: sanity check input channel indices in all cases.
  id3v2: pad the APIC packets as required by lavc.
  lavf: make sure stream probe data gets freed.
  dfa: check for invalid access in decode_wdlt().

Conflicts:
	libavformat/id3v2.c
	libavformat/utils.c

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

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