diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-22 22:44:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-22 22:44:15 +0100 |
| commit | 80ddf7889eecef0a9f9f4d7e3e8a0b2e3f700521 (patch) | |
| tree | 7cfc3cb358683d932f3a82fe6dda8dc858736373 /presets/libx264-ipod320.ffpreset | |
| parent | 4be63111d1a29a13153cc25dcd9681dbbe7e0851 (diff) | |
| parent | 6626a7df534591c1eaed860bcb2f61610a3727f4 (diff) | |
| download | ffmpeg-80ddf7889eecef0a9f9f4d7e3e8a0b2e3f700521.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
doc: Fix some obsolete references to av* tools as ff* tools
vqavideo: check chunk sizes before reading chunks
roqvideodec: check dimensions validity
qdm2: check array index before use, fix out of array accesses
mpegvideo: Do REBASE_PICTURE with byte pointers
Conflicts:
libavcodec/qdm2.c
libavcodec/roqvideodec.c
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libx264-ipod320.ffpreset')
0 files changed, 0 insertions, 0 deletions