diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:50:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 11:10:09 +0200 |
| commit | ff4680922fc4f1295081da45173e9a71d141a045 (patch) | |
| tree | f30f162527bfc053e0bf5139289e83311cb16e10 /libswscale/swscale-test.c | |
| parent | 75835abe910f686cc8dda1fc1ac147f412ecdeda (diff) | |
| parent | e6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28 (diff) | |
| download | ffmpeg-ff4680922fc4f1295081da45173e9a71d141a045.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale-test.c')
0 files changed, 0 insertions, 0 deletions