diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 13:35:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 13:35:30 +0200 |
| commit | a367ab657f29869d46ca57ce58251b02343a2b53 (patch) | |
| tree | de4a4651ff76d3d35a5e1422b5b49f6449dff578 /libavcodec/indeo3.c | |
| parent | 63235b8d419d7250bdc3ff9067c0737a9fbe6ff7 (diff) | |
| parent | 8f558c3e101859aec9adcb4b4b270ae1ef8f88b5 (diff) | |
| download | ffmpeg-a367ab657f29869d46ca57ce58251b02343a2b53.tar.gz | |
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>
Diffstat (limited to 'libavcodec/indeo3.c')
0 files changed, 0 insertions, 0 deletions