Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 08:50:20 +0000 (10:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 09:10:09 +0000 (11:10 +0200)
commitff4680922fc4f1295081da45173e9a71d141a045
treef30f162527bfc053e0bf5139289e83311cb16e10
parent75835abe910f686cc8dda1fc1ac147f412ecdeda
parente6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28
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>
19 files changed:
cmdutils.c
doc/APIchanges
libavcodec/imgconvert.c
libavcodec/pnm.c
libavcodec/rawdec.c
libavcodec/utils.c
libavcodec/xwdenc.c
libavfilter/formats.c
libavfilter/vf_crop.c
libavfilter/vf_fieldorder.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/frame.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/version.h
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c