Merge commit '8f558c3e101859aec9adcb4b4b270ae1ef8f88b5' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 11:35:30 +0000 (13:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 11:35:30 +0000 (13:35 +0200)
commita367ab657f29869d46ca57ce58251b02343a2b53
treede4a4651ff76d3d35a5e1422b5b49f6449dff578
parent63235b8d419d7250bdc3ff9067c0737a9fbe6ff7
parent8f558c3e101859aec9adcb4b4b270ae1ef8f88b5
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@gmx.at>
libavcodec/dfa.c
libavfilter/af_channelmap.c
libavformat/id3v2.c
libavformat/utils.c