Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Nov 2011 00:38:21 +0000 (01:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Nov 2011 03:34:44 +0000 (04:34 +0100)
commit92afb431621c79155fcb7171d26f137eb1bee028
tree2beb660ea9fafc1d2d304c0f7df610ebf54117e0
parent3880b4541ace2697f380ae1f43cb2299efeb2cc7
parent7f1b427018ecff59e0e14031eecc79aac0d91ec8
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  snow: split snow in snowdec and snowenc
  tiffenc: deprecate using compression_level
  swscale: fix failing fate tests.
  swscale: add support for planar RGB input.
  h264: add support for decoding planar RGB images.
  Clean up swscale pixfmt macros using av_pix_fmt_descriptors[].
  pixfmt: add planar RGB formats.

Conflicts:
libavcodec/h264.c
libavcodec/snow.c
libavcodec/utils.c
libavutil/avutil.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
libavcodec/Makefile
libavcodec/h264.c
libavcodec/snow.c
libavcodec/snow.h
libavcodec/snowdec.c
libavcodec/snowenc.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/version.h
libavutil/avutil.h
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/pixfmt.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c