Merge commit '183db02a51a422568084b113a7571c845ca68622'

* commit '183db02a51a422568084b113a7571c845ca68622':
  lavu: Drop deprecated old_pix_fmt.h and related code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavutil/Makefile
index ac9313f89a1f7304f914384c1992c0c190173136,9d81006921ddac2e44e38f853e9837136e29d799..b76bcde9e043b5f8e0b65b4e8fa1bac848e606fb
--- 1/libavutil/Makefile
--- 2/libavutil/Makefile
+++ b/libavutil/Makefile
@@@ -39,10 -33,7 +39,9 @@@ HEADERS = adler32.
            mathematics.h                                                 \
            md5.h                                                         \
            mem.h                                                         \
 +          motion_vector.h                                               \
 +          murmur3.h                                                     \
            dict.h                                                        \
-           old_pix_fmts.h                                                \
            opt.h                                                         \
            parseutils.h                                                  \
            pixdesc.h                                                     \
@@@ -145,11 -107,6 +144,9 @@@ OBJS-$(CONFIG_OPENCL
  
  OBJS += $(COMPAT_OBJS:%=../compat/%)
  
- SKIPHEADERS          = old_pix_fmts.h
- 
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES)            += avutilres.o
 +
  SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
  SKIPHEADERS-$(HAVE_ATOMICS_SUNCC)      += atomic_suncc.h
  SKIPHEADERS-$(HAVE_ATOMICS_WIN32)      += atomic_win32.h

diff --cc libavutil/pixdesc.h
Simple merge

diff --cc libavutil/pixfmt.h
index 029c911d49abaf7bbc8e7457fd58b823f7687317,ffc7256c8fb3ebdaff7640114c37f12be6b022e6..0dc82924c4f420fc7fb328ef3ae3e9a4e5962bd6
--- 1/libavutil/pixfmt.h
--- 2/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@@ -267,87 -217,9 +267,83 @@@ enum AVPixelFormat 
  
      AV_PIX_FMT_D3D11VA_VLD,  ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer
  
 +#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
 +    AV_PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
 +    AV_PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
 +#endif
 +    AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB...   X=unused/undefined
 +    AV_PIX_FMT_RGB0,        ///< packed RGB 8:8:8, 32bpp, RGBXRGBX...   X=unused/undefined
 +    AV_PIX_FMT_0BGR,        ///< packed BGR 8:8:8, 32bpp, XBGRXBGR...   X=unused/undefined
 +    AV_PIX_FMT_BGR0,        ///< packed BGR 8:8:8, 32bpp, BGRXBGRX...   X=unused/undefined
 +    AV_PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
 +    AV_PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
 +
 +    AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
 +    AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
 +    AV_PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
 +    AV_PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
 +    AV_PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 +    AV_PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
 +    AV_PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 +    AV_PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
 +    AV_PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
 +    AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
 +    AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
 +    AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
 +    AV_PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big-endian
 +    AV_PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little-endian
 +    AV_PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big-endian
 +    AV_PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little-endian
 +    AV_PIX_FMT_GBRAP,       ///< planar GBRA 4:4:4:4 32bpp
 +    AV_PIX_FMT_GBRAP16BE,   ///< planar GBRA 4:4:4:4 64bpp, big-endian
 +    AV_PIX_FMT_GBRAP16LE,   ///< planar GBRA 4:4:4:4 64bpp, little-endian
 +    AV_PIX_FMT_YUVJ411P,    ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV411P and setting color_range
 +
 +    AV_PIX_FMT_BAYER_BGGR8,    ///< bayer, BGBG..(odd line), GRGR..(even line), 8-bit samples */
 +    AV_PIX_FMT_BAYER_RGGB8,    ///< bayer, RGRG..(odd line), GBGB..(even line), 8-bit samples */
 +    AV_PIX_FMT_BAYER_GBRG8,    ///< bayer, GBGB..(odd line), RGRG..(even line), 8-bit samples */
 +    AV_PIX_FMT_BAYER_GRBG8,    ///< bayer, GRGR..(odd line), BGBG..(even line), 8-bit samples */
 +    AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, little-endian */
 +    AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, big-endian */
 +    AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, little-endian */
 +    AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, big-endian */
 +    AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, little-endian */
 +    AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */
 +    AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */
 +    AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */
 +#if !FF_API_XVMC
 +    AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
 +#endif /* !FF_API_XVMC */
 +    AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian
 +    AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian
 +    AV_PIX_FMT_YUV440P12LE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian
 +    AV_PIX_FMT_YUV440P12BE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian
 +    AV_PIX_FMT_AYUV64LE,    ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
 +    AV_PIX_FMT_AYUV64BE,    ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
 +
 +    AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox
 +
      AV_PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
- 
- #if FF_API_PIX_FMT
- #include "old_pix_fmts.h"
- #endif
  };
  
 +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
 +#define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV
 +#define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV
 +#define AV_PIX_FMT_RGBA64BE AV_PIX_FMT_RGBA64BE_LIBAV
 +#define AV_PIX_FMT_RGBA64LE AV_PIX_FMT_RGBA64LE_LIBAV
 +#define AV_PIX_FMT_BGRA64BE AV_PIX_FMT_BGRA64BE_LIBAV
 +#define AV_PIX_FMT_BGRA64LE AV_PIX_FMT_BGRA64LE_LIBAV
 +#define AV_PIX_FMT_GBRAP     AV_PIX_FMT_GBRAP_LIBAV
 +#define AV_PIX_FMT_GBRAP16BE AV_PIX_FMT_GBRAP16BE_LIBAV
 +#define AV_PIX_FMT_GBRAP16LE AV_PIX_FMT_GBRAP16LE_LIBAV
 +#endif
 +
 +
 +#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A
 +#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP
 +
  #if AV_HAVE_BIGENDIAN
  #   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
  #else
@@@ -417,59 -272,7 +413,8 @@@
  
  #define AV_PIX_FMT_XYZ12      AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
  #define AV_PIX_FMT_NV20       AV_PIX_FMT_NE(NV20BE,  NV20LE)
 +#define AV_PIX_FMT_AYUV64     AV_PIX_FMT_NE(AYUV64BE, AYUV64LE)
  
- 
- #if FF_API_PIX_FMT
- #define PixelFormat AVPixelFormat
- 
- #define PIX_FMT_Y400A AV_PIX_FMT_Y400A
- #define PIX_FMT_GBR24P AV_PIX_FMT_GBR24P
- 
- #define PIX_FMT_NE(be, le) AV_PIX_FMT_NE(be, le)
- 
- #define PIX_FMT_RGB32   AV_PIX_FMT_RGB32
- #define PIX_FMT_RGB32_1 AV_PIX_FMT_RGB32_1
- #define PIX_FMT_BGR32   AV_PIX_FMT_BGR32
- #define PIX_FMT_BGR32_1 AV_PIX_FMT_BGR32_1
- #define PIX_FMT_0RGB32  AV_PIX_FMT_0RGB32
- #define PIX_FMT_0BGR32  AV_PIX_FMT_0BGR32
- 
- #define PIX_FMT_GRAY16 AV_PIX_FMT_GRAY16
- #define PIX_FMT_RGB48  AV_PIX_FMT_RGB48
- #define PIX_FMT_RGB565 AV_PIX_FMT_RGB565
- #define PIX_FMT_RGB555 AV_PIX_FMT_RGB555
- #define PIX_FMT_RGB444 AV_PIX_FMT_RGB444
- #define PIX_FMT_BGR48  AV_PIX_FMT_BGR48
- #define PIX_FMT_BGR565 AV_PIX_FMT_BGR565
- #define PIX_FMT_BGR555 AV_PIX_FMT_BGR555
- #define PIX_FMT_BGR444 AV_PIX_FMT_BGR444
- 
- #define PIX_FMT_YUV420P9  AV_PIX_FMT_YUV420P9
- #define PIX_FMT_YUV422P9  AV_PIX_FMT_YUV422P9
- #define PIX_FMT_YUV444P9  AV_PIX_FMT_YUV444P9
- #define PIX_FMT_YUV420P10 AV_PIX_FMT_YUV420P10
- #define PIX_FMT_YUV422P10 AV_PIX_FMT_YUV422P10
- #define PIX_FMT_YUV444P10 AV_PIX_FMT_YUV444P10
- #define PIX_FMT_YUV420P12 AV_PIX_FMT_YUV420P12
- #define PIX_FMT_YUV422P12 AV_PIX_FMT_YUV422P12
- #define PIX_FMT_YUV444P12 AV_PIX_FMT_YUV444P12
- #define PIX_FMT_YUV420P14 AV_PIX_FMT_YUV420P14
- #define PIX_FMT_YUV422P14 AV_PIX_FMT_YUV422P14
- #define PIX_FMT_YUV444P14 AV_PIX_FMT_YUV444P14
- #define PIX_FMT_YUV420P16 AV_PIX_FMT_YUV420P16
- #define PIX_FMT_YUV422P16 AV_PIX_FMT_YUV422P16
- #define PIX_FMT_YUV444P16 AV_PIX_FMT_YUV444P16
- 
- #define PIX_FMT_RGBA64 AV_PIX_FMT_RGBA64
- #define PIX_FMT_BGRA64 AV_PIX_FMT_BGRA64
- #define PIX_FMT_GBRP9  AV_PIX_FMT_GBRP9
- #define PIX_FMT_GBRP10 AV_PIX_FMT_GBRP10
- #define PIX_FMT_GBRP12 AV_PIX_FMT_GBRP12
- #define PIX_FMT_GBRP14 AV_PIX_FMT_GBRP14
- #define PIX_FMT_GBRP16 AV_PIX_FMT_GBRP16
- #endif
- 
  /**
    * Chromaticity coordinates of the source primaries.
    */

diff --cc libavutil/version.h
index 64713d38256a74ac9c0622416b9a37a5144ea2b0,ad758cb49ce454684242e8ebffea9bf30bd32365..85126dba036828a2959172467186b83fe6e23cb8
--- 1/libavutil/version.h
--- 2/libavutil/version.h
+++ b/libavutil/version.h
@@@ -84,12 -78,6 +84,9 @@@
   * @{
   */
  
- #ifndef FF_API_PIX_FMT
- #define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 55)
- #endif
 +#ifndef FF_API_OLD_AVOPTIONS
 +#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 55)
 +#endif
  #ifndef FF_API_CONTEXT_SIZE
  #define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 55)
  #endif