• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 92afb431
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    92afb431
h264.c 166 KB