Changeset 92afb43 in ffmpeg

Timestamp:

Nov 25, 2011, 3:34:44 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6d16a96a

Parents:

3880b454 (diff), 7f1b4270 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/25/11 00:38:21)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/25/11 03:34:44)

Message:

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>

(No files)