diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-17 15:12:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-17 15:15:43 +0200 |
| commit | 291b220377d43adbecc86da84f43aed547957ffc (patch) | |
| tree | 1ed87946e01e30c2b989c8822503c61ff99ad0c8 /libswscale/rgb2rgb.c | |
| parent | 1ad63ff14adb652996c4604da59a330cef0d494e (diff) | |
| parent | 2f34021d57b1343bb01b377a4797bef7cbc7be3c (diff) | |
| download | ffmpeg-291b220377d43adbecc86da84f43aed547957ffc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: flush filtered frames before reconfiguring filters
mov: stsd entries must be at least 16 byte
mov: detect EOF in mov_read_dref()
file: return proper error on seek failures
Conflicts:
libavformat/file.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/rgb2rgb.c')
0 files changed, 0 insertions, 0 deletions