diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-22 23:16:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-22 23:16:49 +0100 |
| commit | 464cef4c14a6a550ee30810416d18686b5f3ffa0 (patch) | |
| tree | 906af3c9685883fb966b8d95f2e416e68b9fee36 /libavcodec/proresdec2.c | |
| parent | 9759d2b886057b90355716edb23262e17f9bc3f9 (diff) | |
| parent | 5023b89bba198b2f8e43b7f555aeb9c30d33db9f (diff) | |
| download | ffmpeg-464cef4c14a6a550ee30810416d18686b5f3ffa0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
xwma: Validate channels and bits_per_coded_sample.
mov: Do not read past the end of the ctts_data table.
mov: Add missing terminator to mov_ch_layout_map_1ch.
asf: reset side data elements on packet copy.
wmavoice: fix stack overread.
wmalossless: error out if a subframe is not used by any channel.
vqa: check palette chunk size before reading data.
wmalossless: reset sample pointer for each subframe.
wmalossless: error out on invalid values for order.
Conflicts:
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdec2.c')
0 files changed, 0 insertions, 0 deletions