diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:57:47 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 16:14:11 +0400 |
commit | 3b0bb321a50cd2591c6bd46059a66f6a53d9fc08 (patch) | |
tree | 1e9caead8b857d3a52b4b2dd86407670442ea05a /libavutil | |
parent | 3cc0252732513dc7411093935821b1eb6416a9a6 (diff) | |
parent | f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507 (diff) |
Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'
* commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507':
avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
rtspdec: Set the default port for listen mode, if none is specified
tscc2: Fix an out of array access
rtmpproto: Fix an out of array write
rtspdec: Fix use of uninitialized byte
vp8: reset loopfilter delta values at keyframes.
avutil: add yuva422p and yuva444p formats
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/pixfmt.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 4997bf2158..ef7a16ae06 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -173,6 +173,14 @@ enum AVPixelFormat { AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big endian AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little endian + /** + * duplicated pixel formats for compatibility with libav. + * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits f9ca1ac7 and 143a5c55) + * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85) + */ + AV_PIX_FMT_YUVA422P_LIBAV, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) + AV_PIX_FMT_YUVA444P_LIBAV, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) + #ifndef AV_PIX_FMT_ABI_GIT_MASTER AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian @@ -210,6 +218,12 @@ enum AVPixelFormat { #endif }; +#if AV_HAVE_INCOMPATIBLE_FORK_ABI +#define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV +#define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV +#endif + + #define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A #define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP |