James Almer:
> It's been a year since the last bump, so lets get rid of old deprecated API
> in time for ffmpeg 8.0
>
And another unavpriving.
- Andreas
From b07fa1e5794c4823d793c37d9353e3628b3f8615 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
Date: Fri, 28 Mar 2025 17:15:22 +0100
Subject: [PATCH] avcodec/raw: Duplicate raw_pix_fmt_tags into fourcc2pixfmt
tool
Do this instead of exporting raw_pix_fmt_tags
via avpriv_get_raw_pix_fmt_tags().
For shared builds this will lead to an increase in the
combined size of the lavc and fourcc2pixfmt binaries
(because the overhead of exporting avpriv_get_raw_pix_fmt_tags()
is dwarfed by the size of the array), but given that
fourcc2pixfmt is a test tool that is not widely distributed
it does not really matter. For static builds the opposite
is true (the rest of lavc/raw.o is no longer pulled into
the test tool and the getter can be removed, too).
This patch has the additional benefit of removing
struct PixelFormatTag from the ABI.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/raw.c | 295 +------------------------------
libavcodec/raw.h | 2 -
libavcodec/raw_pix_fmt_tags.h | 316 ++++++++++++++++++++++++++++++++++
tools/fourcc2pixfmt.c | 7 +-
4 files changed, 321 insertions(+), 299 deletions(-)
create mode 100644 libavcodec/raw_pix_fmt_tags.h
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 7a332c0fb7..095bd4310b 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -24,302 +24,9 @@
* Raw Video Codec
*/
-#include "libavutil/macros.h"
#include "avcodec.h"
#include "raw.h"
-
-static const PixelFormatTag raw_pix_fmt_tags[] = {
- { AV_PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */
- { AV_PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') },
- { AV_PIX_FMT_YUV420P, MKTAG('y', 'v', '1', '2') },
- { AV_PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') },
- { AV_PIX_FMT_YUV410P, MKTAG('Y', 'U', 'V', '9') },
- { AV_PIX_FMT_YUV410P, MKTAG('Y', 'V', 'U', '9') },
- { AV_PIX_FMT_YUV411P, MKTAG('Y', '4', '1', 'B') },
- { AV_PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') },
- { AV_PIX_FMT_YUV422P, MKTAG('P', '4', '2', '2') },
- { AV_PIX_FMT_YUV422P, MKTAG('Y', 'V', '1', '6') },
- /* yuvjXXX formats are deprecated hacks specific to libav*,
- they are identical to yuvXXX */
- { AV_PIX_FMT_YUVJ420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */
- { AV_PIX_FMT_YUVJ420P, MKTAG('I', 'Y', 'U', 'V') },
- { AV_PIX_FMT_YUVJ420P, MKTAG('Y', 'V', '1', '2') },
- { AV_PIX_FMT_YUVJ422P, MKTAG('Y', '4', '2', 'B') },
- { AV_PIX_FMT_YUVJ422P, MKTAG('P', '4', '2', '2') },
- { AV_PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') },
- { AV_PIX_FMT_GRAY8, MKTAG('Y', '8', ' ', ' ') },
-
- { AV_PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */
- { AV_PIX_FMT_YUYV422, MKTAG('Y', '4', '2', '2') },
- { AV_PIX_FMT_YUYV422, MKTAG('V', '4', '2', '2') },
- { AV_PIX_FMT_YUYV422, MKTAG('V', 'Y', 'U', 'Y') },
- { AV_PIX_FMT_YUYV422, MKTAG('Y', 'U', 'N', 'V') },
- { AV_PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', 'V') },
- { AV_PIX_FMT_YVYU422, MKTAG('Y', 'V', 'Y', 'U') }, /* Philips */
- { AV_PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') },
- { AV_PIX_FMT_UYVY422, MKTAG('H', 'D', 'Y', 'C') },
- { AV_PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'V') },
- { AV_PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'Y') },
- { AV_PIX_FMT_UYVY422, MKTAG('u', 'y', 'v', '1') },
- { AV_PIX_FMT_UYVY422, MKTAG('2', 'V', 'u', '1') },
- { AV_PIX_FMT_UYVY422, MKTAG('A', 'V', 'R', 'n') }, /* Avid AVI Codec 1:1 */
- { AV_PIX_FMT_UYVY422, MKTAG('A', 'V', '1', 'x') }, /* Avid 1:1x */
- { AV_PIX_FMT_UYVY422, MKTAG('A', 'V', 'u', 'p') },
- { AV_PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
- { AV_PIX_FMT_UYVY422, MKTAG('a', 'u', 'v', '2') },
- { AV_PIX_FMT_UYVY422, MKTAG('c', 'y', 'u', 'v') }, /* CYUV is also Creative YUV */
- { AV_PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') },
- { AV_PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') },
- { AV_PIX_FMT_NV12, MKTAG('N', 'V', '1', '2') },
- { AV_PIX_FMT_NV21, MKTAG('N', 'V', '2', '1') },
- { AV_PIX_FMT_VUYA, MKTAG('A', 'Y', 'U', 'V') }, /* MS 4:4:4:4 */
- { AV_PIX_FMT_XV30LE, MKTAG('Y', '4', '1', '0') },
- { AV_PIX_FMT_XV48LE, MKTAG('Y', '4', '1', '6') },
- { AV_PIX_FMT_Y210LE, MKTAG('Y', '2', '1', '0') },
- { AV_PIX_FMT_Y216LE, MKTAG('Y', '2', '1', '6') },
-
- /* nut */
- { AV_PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) },
- { AV_PIX_FMT_BGR555LE, MKTAG('B', 'G', 'R', 15) },
- { AV_PIX_FMT_RGB565LE, MKTAG('R', 'G', 'B', 16) },
- { AV_PIX_FMT_BGR565LE, MKTAG('B', 'G', 'R', 16) },
- { AV_PIX_FMT_RGB555BE, MKTAG(15 , 'B', 'G', 'R') },
- { AV_PIX_FMT_BGR555BE, MKTAG(15 , 'R', 'G', 'B') },
- { AV_PIX_FMT_RGB565BE, MKTAG(16 , 'B', 'G', 'R') },
- { AV_PIX_FMT_BGR565BE, MKTAG(16 , 'R', 'G', 'B') },
- { AV_PIX_FMT_RGB444LE, MKTAG('R', 'G', 'B', 12) },
- { AV_PIX_FMT_BGR444LE, MKTAG('B', 'G', 'R', 12) },
- { AV_PIX_FMT_RGB444BE, MKTAG(12 , 'B', 'G', 'R') },
- { AV_PIX_FMT_BGR444BE, MKTAG(12 , 'R', 'G', 'B') },
- { AV_PIX_FMT_RGBA64LE, MKTAG('R', 'B', 'A', 64 ) },
- { AV_PIX_FMT_BGRA64LE, MKTAG('B', 'R', 'A', 64 ) },
- { AV_PIX_FMT_RGBA64BE, MKTAG(64 , 'R', 'B', 'A') },
- { AV_PIX_FMT_BGRA64BE, MKTAG(64 , 'B', 'R', 'A') },
- { AV_PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') },
- { AV_PIX_FMT_RGB0, MKTAG('R', 'G', 'B', 0 ) },
- { AV_PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') },
- { AV_PIX_FMT_BGR0, MKTAG('B', 'G', 'R', 0 ) },
- { AV_PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') },
- { AV_PIX_FMT_0BGR, MKTAG( 0 , 'B', 'G', 'R') },
- { AV_PIX_FMT_ARGB, MKTAG('A', 'R', 'G', 'B') },
- { AV_PIX_FMT_0RGB, MKTAG( 0 , 'R', 'G', 'B') },
- { AV_PIX_FMT_RGB24, MKTAG('R', 'G', 'B', 24 ) },
- { AV_PIX_FMT_BGR24, MKTAG('B', 'G', 'R', 24 ) },
- { AV_PIX_FMT_YUV411P, MKTAG('4', '1', '1', 'P') },
- { AV_PIX_FMT_YUV422P, MKTAG('4', '2', '2', 'P') },
- { AV_PIX_FMT_YUVJ422P, MKTAG('4', '2', '2', 'P') },
- { AV_PIX_FMT_YUV440P, MKTAG('4', '4', '0', 'P') },
- { AV_PIX_FMT_YUVJ440P, MKTAG('4', '4', '0', 'P') },
- { AV_PIX_FMT_YUV444P, MKTAG('4', '4', '4', 'P') },
- { AV_PIX_FMT_YUVJ444P, MKTAG('4', '4', '4', 'P') },
- { AV_PIX_FMT_MONOWHITE,MKTAG('B', '1', 'W', '0') },
- { AV_PIX_FMT_MONOBLACK,MKTAG('B', '0', 'W', '1') },
- { AV_PIX_FMT_BGR8, MKTAG('B', 'G', 'R', 8 ) },
- { AV_PIX_FMT_RGB8, MKTAG('R', 'G', 'B', 8 ) },
- { AV_PIX_FMT_BGR4, MKTAG('B', 'G', 'R', 4 ) },
- { AV_PIX_FMT_RGB4, MKTAG('R', 'G', 'B', 4 ) },
- { AV_PIX_FMT_RGB4_BYTE,MKTAG('B', '4', 'B', 'Y') },
- { AV_PIX_FMT_BGR4_BYTE,MKTAG('R', '4', 'B', 'Y') },
- { AV_PIX_FMT_RGB48LE, MKTAG('R', 'G', 'B', 48 ) },
- { AV_PIX_FMT_RGB48BE, MKTAG( 48, 'R', 'G', 'B') },
- { AV_PIX_FMT_BGR48LE, MKTAG('B', 'G', 'R', 48 ) },
- { AV_PIX_FMT_BGR48BE, MKTAG( 48, 'B', 'G', 'R') },
- { AV_PIX_FMT_GRAY9LE, MKTAG('Y', '1', 0 , 9 ) },
- { AV_PIX_FMT_GRAY9BE, MKTAG( 9 , 0 , '1', 'Y') },
- { AV_PIX_FMT_GRAY10LE, MKTAG('Y', '1', 0 , 10 ) },
- { AV_PIX_FMT_GRAY10BE, MKTAG(10 , 0 , '1', 'Y') },
- { AV_PIX_FMT_GRAY12LE, MKTAG('Y', '1', 0 , 12 ) },
- { AV_PIX_FMT_GRAY12BE, MKTAG(12 , 0 , '1', 'Y') },
- { AV_PIX_FMT_GRAY14LE, MKTAG('Y', '1', 0 , 14 ) },
- { AV_PIX_FMT_GRAY14BE, MKTAG(14 , 0 , '1', 'Y') },
- { AV_PIX_FMT_GRAY16LE, MKTAG('Y', '1', 0 , 16 ) },
- { AV_PIX_FMT_GRAY16BE, MKTAG(16 , 0 , '1', 'Y') },
- { AV_PIX_FMT_YUV420P9LE, MKTAG('Y', '3', 11 , 9 ) },
- { AV_PIX_FMT_YUV420P9BE, MKTAG( 9 , 11 , '3', 'Y') },
- { AV_PIX_FMT_YUV422P9LE, MKTAG('Y', '3', 10 , 9 ) },
- { AV_PIX_FMT_YUV422P9BE, MKTAG( 9 , 10 , '3', 'Y') },
- { AV_PIX_FMT_YUV444P9LE, MKTAG('Y', '3', 0 , 9 ) },
- { AV_PIX_FMT_YUV444P9BE, MKTAG( 9 , 0 , '3', 'Y') },
- { AV_PIX_FMT_YUV420P10LE, MKTAG('Y', '3', 11 , 10 ) },
- { AV_PIX_FMT_YUV420P10BE, MKTAG(10 , 11 , '3', 'Y') },
- { AV_PIX_FMT_YUV422P10LE, MKTAG('Y', '3', 10 , 10 ) },
- { AV_PIX_FMT_YUV422P10BE, MKTAG(10 , 10 , '3', 'Y') },
- { AV_PIX_FMT_YUV444P10LE, MKTAG('Y', '3', 0 , 10 ) },
- { AV_PIX_FMT_YUV444P10BE, MKTAG(10 , 0 , '3', 'Y') },
- { AV_PIX_FMT_YUV420P12LE, MKTAG('Y', '3', 11 , 12 ) },
- { AV_PIX_FMT_YUV420P12BE, MKTAG(12 , 11 , '3', 'Y') },
- { AV_PIX_FMT_YUV422P12LE, MKTAG('Y', '3', 10 , 12 ) },
- { AV_PIX_FMT_YUV422P12BE, MKTAG(12 , 10 , '3', 'Y') },
- { AV_PIX_FMT_YUV444P12LE, MKTAG('Y', '3', 0 , 12 ) },
- { AV_PIX_FMT_YUV444P12BE, MKTAG(12 , 0 , '3', 'Y') },
- { AV_PIX_FMT_YUV420P14LE, MKTAG('Y', '3', 11 , 14 ) },
- { AV_PIX_FMT_YUV420P14BE, MKTAG(14 , 11 , '3', 'Y') },
- { AV_PIX_FMT_YUV422P14LE, MKTAG('Y', '3', 10 , 14 ) },
- { AV_PIX_FMT_YUV422P14BE, MKTAG(14 , 10 , '3', 'Y') },
- { AV_PIX_FMT_YUV444P14LE, MKTAG('Y', '3', 0 , 14 ) },
- { AV_PIX_FMT_YUV444P14BE, MKTAG(14 , 0 , '3', 'Y') },
- { AV_PIX_FMT_YUV420P16LE, MKTAG('Y', '3', 11 , 16 ) },
- { AV_PIX_FMT_YUV420P16BE, MKTAG(16 , 11 , '3', 'Y') },
- { AV_PIX_FMT_YUV422P16LE, MKTAG('Y', '3', 10 , 16 ) },
- { AV_PIX_FMT_YUV422P16BE, MKTAG(16 , 10 , '3', 'Y') },
- { AV_PIX_FMT_YUV444P16LE, MKTAG('Y', '3', 0 , 16 ) },
- { AV_PIX_FMT_YUV444P16BE, MKTAG(16 , 0 , '3', 'Y') },
- { AV_PIX_FMT_YUVA420P, MKTAG('Y', '4', 11 , 8 ) },
- { AV_PIX_FMT_YUVA422P, MKTAG('Y', '4', 10 , 8 ) },
- { AV_PIX_FMT_YUVA444P, MKTAG('Y', '4', 0 , 8 ) },
- { AV_PIX_FMT_YA8, MKTAG('Y', '2', 0 , 8 ) },
- { AV_PIX_FMT_PAL8, MKTAG('P', 'A', 'L', 8 ) },
-
- { AV_PIX_FMT_YUVA420P9LE, MKTAG('Y', '4', 11 , 9 ) },
- { AV_PIX_FMT_YUVA420P9BE, MKTAG( 9 , 11 , '4', 'Y') },
- { AV_PIX_FMT_YUVA422P9LE, MKTAG('Y', '4', 10 , 9 ) },
- { AV_PIX_FMT_YUVA422P9BE, MKTAG( 9 , 10 , '4', 'Y') },
- { AV_PIX_FMT_YUVA444P9LE, MKTAG('Y', '4', 0 , 9 ) },
- { AV_PIX_FMT_YUVA444P9BE, MKTAG( 9 , 0 , '4', 'Y') },
- { AV_PIX_FMT_YUVA420P10LE, MKTAG('Y', '4', 11 , 10 ) },
- { AV_PIX_FMT_YUVA420P10BE, MKTAG(10 , 11 , '4', 'Y') },
- { AV_PIX_FMT_YUVA422P10LE, MKTAG('Y', '4', 10 , 10 ) },
- { AV_PIX_FMT_YUVA422P10BE, MKTAG(10 , 10 , '4', 'Y') },
- { AV_PIX_FMT_YUVA444P10LE, MKTAG('Y', '4', 0 , 10 ) },
- { AV_PIX_FMT_YUVA444P10BE, MKTAG(10 , 0 , '4', 'Y') },
- { AV_PIX_FMT_YUVA422P12LE, MKTAG('Y', '4', 10 , 12 ) },
- { AV_PIX_FMT_YUVA422P12BE, MKTAG(12 , 10 , '4', 'Y') },
- { AV_PIX_FMT_YUVA444P12LE, MKTAG('Y', '4', 0 , 12 ) },
- { AV_PIX_FMT_YUVA444P12BE, MKTAG(12 , 0 , '4', 'Y') },
- { AV_PIX_FMT_YUVA420P16LE, MKTAG('Y', '4', 11 , 16 ) },
- { AV_PIX_FMT_YUVA420P16BE, MKTAG(16 , 11 , '4', 'Y') },
- { AV_PIX_FMT_YUVA422P16LE, MKTAG('Y', '4', 10 , 16 ) },
- { AV_PIX_FMT_YUVA422P16BE, MKTAG(16 , 10 , '4', 'Y') },
- { AV_PIX_FMT_YUVA444P16LE, MKTAG('Y', '4', 0 , 16 ) },
- { AV_PIX_FMT_YUVA444P16BE, MKTAG(16 , 0 , '4', 'Y') },
-
- { AV_PIX_FMT_GBRP, MKTAG('G', '3', 00 , 8 ) },
- { AV_PIX_FMT_GBRP9LE, MKTAG('G', '3', 00 , 9 ) },
- { AV_PIX_FMT_GBRP9BE, MKTAG( 9 , 00 , '3', 'G') },
- { AV_PIX_FMT_GBRP10LE, MKTAG('G', '3', 00 , 10 ) },
- { AV_PIX_FMT_GBRP10BE, MKTAG(10 , 00 , '3', 'G') },
- { AV_PIX_FMT_GBRP12LE, MKTAG('G', '3', 00 , 12 ) },
- { AV_PIX_FMT_GBRP12BE, MKTAG(12 , 00 , '3', 'G') },
- { AV_PIX_FMT_GBRP14LE, MKTAG('G', '3', 00 , 14 ) },
- { AV_PIX_FMT_GBRP14BE, MKTAG(14 , 00 , '3', 'G') },
- { AV_PIX_FMT_GBRP16LE, MKTAG('G', '3', 00 , 16 ) },
- { AV_PIX_FMT_GBRP16BE, MKTAG(16 , 00 , '3', 'G') },
- { AV_PIX_FMT_GBRPF16LE, MKTAG('G', '3', 00 , 17 ) },
- { AV_PIX_FMT_GBRPF16BE, MKTAG(17 , 00 , '3', 'G') },
- { AV_PIX_FMT_GBRPF32LE, MKTAG('G', '3', 00 , 33 ) },
- { AV_PIX_FMT_GBRPF32BE, MKTAG(33 , 00 , '3', 'G') },
-
- { AV_PIX_FMT_GBRAP, MKTAG('G', '4', 00 , 8 ) },
- { AV_PIX_FMT_GBRAP10LE, MKTAG('G', '4', 00 , 10 ) },
- { AV_PIX_FMT_GBRAP10BE, MKTAG(10 , 00 , '4', 'G') },
- { AV_PIX_FMT_GBRAP12LE, MKTAG('G', '4', 00 , 12 ) },
- { AV_PIX_FMT_GBRAP12BE, MKTAG(12 , 00 , '4', 'G') },
- { AV_PIX_FMT_GBRAP14LE, MKTAG('G', '4', 00 , 14 ) },
- { AV_PIX_FMT_GBRAP14BE, MKTAG(14 , 00 , '4', 'G') },
- { AV_PIX_FMT_GBRAP16LE, MKTAG('G', '4', 00 , 16 ) },
- { AV_PIX_FMT_GBRAP16BE, MKTAG(16 , 00 , '4', 'G') },
- { AV_PIX_FMT_GBRAPF16LE, MKTAG('G', '4', 00 , 17 ) },
- { AV_PIX_FMT_GBRAPF16BE, MKTAG(17 , 00 , '4', 'G') },
- { AV_PIX_FMT_GBRAPF32LE, MKTAG('G', '4', 00 , 33 ) },
- { AV_PIX_FMT_GBRAPF32BE, MKTAG(33 , 00 , '4', 'G') },
-
- { AV_PIX_FMT_XYZ12LE, MKTAG('X', 'Y', 'Z' , 36 ) },
- { AV_PIX_FMT_XYZ12BE, MKTAG(36 , 'Z' , 'Y', 'X') },
-
- { AV_PIX_FMT_BAYER_BGGR8, MKTAG(0xBA, 'B', 'G', 8 ) },
- { AV_PIX_FMT_BAYER_BGGR16LE, MKTAG(0xBA, 'B', 'G', 16 ) },
- { AV_PIX_FMT_BAYER_BGGR16BE, MKTAG(16 , 'G', 'B', 0xBA) },
- { AV_PIX_FMT_BAYER_RGGB8, MKTAG(0xBA, 'R', 'G', 8 ) },
- { AV_PIX_FMT_BAYER_RGGB16LE, MKTAG(0xBA, 'R', 'G', 16 ) },
- { AV_PIX_FMT_BAYER_RGGB16BE, MKTAG(16 , 'G', 'R', 0xBA) },
- { AV_PIX_FMT_BAYER_GBRG8, MKTAG(0xBA, 'G', 'B', 8 ) },
- { AV_PIX_FMT_BAYER_GBRG16LE, MKTAG(0xBA, 'G', 'B', 16 ) },
- { AV_PIX_FMT_BAYER_GBRG16BE, MKTAG(16, 'B', 'G', 0xBA) },
- { AV_PIX_FMT_BAYER_GRBG8, MKTAG(0xBA, 'G', 'R', 8 ) },
- { AV_PIX_FMT_BAYER_GRBG16LE, MKTAG(0xBA, 'G', 'R', 16 ) },
- { AV_PIX_FMT_BAYER_GRBG16BE, MKTAG(16, 'R', 'G', 0xBA) },
-
- /* quicktime */
- { AV_PIX_FMT_YUV420P, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */
- { AV_PIX_FMT_YUV411P, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */
- { AV_PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') },
- { AV_PIX_FMT_UYVY422, MKTAG('2', 'V', 'u', 'y') },
- { AV_PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */
- { AV_PIX_FMT_UYVY422, MKTAG('b', 'x', 'y', 'v') },
- { AV_PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') },
- { AV_PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') },
- { AV_PIX_FMT_YUYV422, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
- { AV_PIX_FMT_VYU444, MKTAG('v', '3', '0', '8') },
- { AV_PIX_FMT_UYVA, MKTAG('v', '4', '0', '8') },
- { AV_PIX_FMT_V30XLE, MKTAG('v', '4', '1', '0') },
- { AV_PIX_FMT_AYUV, MKTAG('y', '4', '0', '8') },
- { AV_PIX_FMT_RGB555LE,MKTAG('L', '5', '5', '5') },
- { AV_PIX_FMT_RGB565LE,MKTAG('L', '5', '6', '5') },
- { AV_PIX_FMT_RGB565BE,MKTAG('B', '5', '6', '5') },
- { AV_PIX_FMT_BGR24, MKTAG('2', '4', 'B', 'G') },
- { AV_PIX_FMT_BGR24, MKTAG('b', 'x', 'b', 'g') },
- { AV_PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') },
- { AV_PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') },
- { AV_PIX_FMT_RGB24, MKTAG('b', 'x', 'r', 'g') },
- { AV_PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') },
- { AV_PIX_FMT_GRAY16BE,MKTAG('b', '1', '6', 'g') },
- { AV_PIX_FMT_RGB48BE, MKTAG('b', '4', '8', 'r') },
- { AV_PIX_FMT_RGBA64BE,MKTAG('b', '6', '4', 'a') },
- { AV_PIX_FMT_BAYER_RGGB16BE, MKTAG('B', 'G', 'G', 'R') },
-
- /* vlc */
- { AV_PIX_FMT_YUV410P, MKTAG('I', '4', '1', '0') },
- { AV_PIX_FMT_YUV411P, MKTAG('I', '4', '1', '1') },
- { AV_PIX_FMT_YUV422P, MKTAG('I', '4', '2', '2') },
- { AV_PIX_FMT_YUV440P, MKTAG('I', '4', '4', '0') },
- { AV_PIX_FMT_YUV444P, MKTAG('I', '4', '4', '4') },
- { AV_PIX_FMT_YUVJ420P, MKTAG('J', '4', '2', '0') },
- { AV_PIX_FMT_YUVJ422P, MKTAG('J', '4', '2', '2') },
- { AV_PIX_FMT_YUVJ440P, MKTAG('J', '4', '4', '0') },
- { AV_PIX_FMT_YUVJ444P, MKTAG('J', '4', '4', '4') },
- { AV_PIX_FMT_YUVA444P, MKTAG('Y', 'U', 'V', 'A') },
- { AV_PIX_FMT_YUVA420P, MKTAG('I', '4', '0', 'A') },
- { AV_PIX_FMT_YUVA422P, MKTAG('I', '4', '2', 'A') },
- { AV_PIX_FMT_RGB8, MKTAG('R', 'G', 'B', '2') },
- { AV_PIX_FMT_RGB555LE, MKTAG('R', 'V', '1', '5') },
- { AV_PIX_FMT_RGB565LE, MKTAG('R', 'V', '1', '6') },
- { AV_PIX_FMT_BGR24, MKTAG('R', 'V', '2', '4') },
- { AV_PIX_FMT_BGR0, MKTAG('R', 'V', '3', '2') },
- { AV_PIX_FMT_RGBA, MKTAG('A', 'V', '3', '2') },
- { AV_PIX_FMT_YUV420P9LE, MKTAG('I', '0', '9', 'L') },
- { AV_PIX_FMT_YUV420P9BE, MKTAG('I', '0', '9', 'B') },
- { AV_PIX_FMT_YUV422P9LE, MKTAG('I', '2', '9', 'L') },
- { AV_PIX_FMT_YUV422P9BE, MKTAG('I', '2', '9', 'B') },
- { AV_PIX_FMT_YUV444P9LE, MKTAG('I', '4', '9', 'L') },
- { AV_PIX_FMT_YUV444P9BE, MKTAG('I', '4', '9', 'B') },
- { AV_PIX_FMT_YUV420P10LE, MKTAG('I', '0', 'A', 'L') },
- { AV_PIX_FMT_YUV420P10BE, MKTAG('I', '0', 'A', 'B') },
- { AV_PIX_FMT_YUV422P10LE, MKTAG('I', '2', 'A', 'L') },
- { AV_PIX_FMT_YUV422P10BE, MKTAG('I', '2', 'A', 'B') },
- { AV_PIX_FMT_YUV444P10LE, MKTAG('I', '4', 'A', 'L') },
- { AV_PIX_FMT_YUV444P10BE, MKTAG('I', '4', 'A', 'B') },
- { AV_PIX_FMT_YUV420P12LE, MKTAG('I', '0', 'C', 'L') },
- { AV_PIX_FMT_YUV420P12BE, MKTAG('I', '0', 'C', 'B') },
- { AV_PIX_FMT_YUV422P12LE, MKTAG('I', '2', 'C', 'L') },
- { AV_PIX_FMT_YUV422P12BE, MKTAG('I', '2', 'C', 'B') },
- { AV_PIX_FMT_YUV444P12LE, MKTAG('I', '4', 'C', 'L') },
- { AV_PIX_FMT_YUV444P12BE, MKTAG('I', '4', 'C', 'B') },
- { AV_PIX_FMT_YUV420P16LE, MKTAG('I', '0', 'F', 'L') },
- { AV_PIX_FMT_YUV420P16BE, MKTAG('I', '0', 'F', 'B') },
- { AV_PIX_FMT_YUV444P16LE, MKTAG('I', '4', 'F', 'L') },
- { AV_PIX_FMT_YUV444P16BE, MKTAG('I', '4', 'F', 'B') },
-
- /* special */
- { AV_PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */
- { AV_PIX_FMT_YUV444P, MKTAG('Y', 'V', '2', '4') }, /* YUV444P, swapped UV */
-
- { AV_PIX_FMT_NONE, 0 },
-};
-
-const struct PixelFormatTag *avpriv_get_raw_pix_fmt_tags(void)
-{
- return raw_pix_fmt_tags;
-}
+#include "raw_pix_fmt_tags.h"
unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat fmt)
{
diff --git a/libavcodec/raw.h b/libavcodec/raw.h
index 9a4ddef8fc..69f7f530ad 100644
--- a/libavcodec/raw.h
+++ b/libavcodec/raw.h
@@ -34,8 +34,6 @@ typedef struct PixelFormatTag {
unsigned int fourcc;
} PixelFormatTag;
-const struct PixelFormatTag *avpriv_get_raw_pix_fmt_tags(void);
-
enum PixelFormatTagLists {
PIX_FMT_LIST_RAW,
PIX_FMT_LIST_AVI,
diff --git a/libavcodec/raw_pix_fmt_tags.h b/libavcodec/raw_pix_fmt_tags.h
new file mode 100644
index 0000000000..bdde060cf7
--- /dev/null
+++ b/libavcodec/raw_pix_fmt_tags.h
@@ -0,0 +1,316 @@
+/*
+ * Raw Video Codec
+ * Copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_RAW_PIX_FMT_TAGS_H
+#define AVCODEC_RAW_PIX_FMT_TAGS_H
+
+#include "raw.h"
+#include "libavutil/macros.h"
+
+static const PixelFormatTag raw_pix_fmt_tags[] = {
+ { AV_PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */
+ { AV_PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') },
+ { AV_PIX_FMT_YUV420P, MKTAG('y', 'v', '1', '2') },
+ { AV_PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') },
+ { AV_PIX_FMT_YUV410P, MKTAG('Y', 'U', 'V', '9') },
+ { AV_PIX_FMT_YUV410P, MKTAG('Y', 'V', 'U', '9') },
+ { AV_PIX_FMT_YUV411P, MKTAG('Y', '4', '1', 'B') },
+ { AV_PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') },
+ { AV_PIX_FMT_YUV422P, MKTAG('P', '4', '2', '2') },
+ { AV_PIX_FMT_YUV422P, MKTAG('Y', 'V', '1', '6') },
+ /* yuvjXXX formats are deprecated hacks specific to libav*,
+ they are identical to yuvXXX */
+ { AV_PIX_FMT_YUVJ420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */
+ { AV_PIX_FMT_YUVJ420P, MKTAG('I', 'Y', 'U', 'V') },
+ { AV_PIX_FMT_YUVJ420P, MKTAG('Y', 'V', '1', '2') },
+ { AV_PIX_FMT_YUVJ422P, MKTAG('Y', '4', '2', 'B') },
+ { AV_PIX_FMT_YUVJ422P, MKTAG('P', '4', '2', '2') },
+ { AV_PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') },
+ { AV_PIX_FMT_GRAY8, MKTAG('Y', '8', ' ', ' ') },
+
+ { AV_PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */
+ { AV_PIX_FMT_YUYV422, MKTAG('Y', '4', '2', '2') },
+ { AV_PIX_FMT_YUYV422, MKTAG('V', '4', '2', '2') },
+ { AV_PIX_FMT_YUYV422, MKTAG('V', 'Y', 'U', 'Y') },
+ { AV_PIX_FMT_YUYV422, MKTAG('Y', 'U', 'N', 'V') },
+ { AV_PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', 'V') },
+ { AV_PIX_FMT_YVYU422, MKTAG('Y', 'V', 'Y', 'U') }, /* Philips */
+ { AV_PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') },
+ { AV_PIX_FMT_UYVY422, MKTAG('H', 'D', 'Y', 'C') },
+ { AV_PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'V') },
+ { AV_PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'Y') },
+ { AV_PIX_FMT_UYVY422, MKTAG('u', 'y', 'v', '1') },
+ { AV_PIX_FMT_UYVY422, MKTAG('2', 'V', 'u', '1') },
+ { AV_PIX_FMT_UYVY422, MKTAG('A', 'V', 'R', 'n') }, /* Avid AVI Codec 1:1 */
+ { AV_PIX_FMT_UYVY422, MKTAG('A', 'V', '1', 'x') }, /* Avid 1:1x */
+ { AV_PIX_FMT_UYVY422, MKTAG('A', 'V', 'u', 'p') },
+ { AV_PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
+ { AV_PIX_FMT_UYVY422, MKTAG('a', 'u', 'v', '2') },
+ { AV_PIX_FMT_UYVY422, MKTAG('c', 'y', 'u', 'v') }, /* CYUV is also Creative YUV */
+ { AV_PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') },
+ { AV_PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') },
+ { AV_PIX_FMT_NV12, MKTAG('N', 'V', '1', '2') },
+ { AV_PIX_FMT_NV21, MKTAG('N', 'V', '2', '1') },
+ { AV_PIX_FMT_VUYA, MKTAG('A', 'Y', 'U', 'V') }, /* MS 4:4:4:4 */
+ { AV_PIX_FMT_XV30LE, MKTAG('Y', '4', '1', '0') },
+ { AV_PIX_FMT_XV48LE, MKTAG('Y', '4', '1', '6') },
+ { AV_PIX_FMT_Y210LE, MKTAG('Y', '2', '1', '0') },
+ { AV_PIX_FMT_Y216LE, MKTAG('Y', '2', '1', '6') },
+
+ /* nut */
+ { AV_PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) },
+ { AV_PIX_FMT_BGR555LE, MKTAG('B', 'G', 'R', 15) },
+ { AV_PIX_FMT_RGB565LE, MKTAG('R', 'G', 'B', 16) },
+ { AV_PIX_FMT_BGR565LE, MKTAG('B', 'G', 'R', 16) },
+ { AV_PIX_FMT_RGB555BE, MKTAG(15 , 'B', 'G', 'R') },
+ { AV_PIX_FMT_BGR555BE, MKTAG(15 , 'R', 'G', 'B') },
+ { AV_PIX_FMT_RGB565BE, MKTAG(16 , 'B', 'G', 'R') },
+ { AV_PIX_FMT_BGR565BE, MKTAG(16 , 'R', 'G', 'B') },
+ { AV_PIX_FMT_RGB444LE, MKTAG('R', 'G', 'B', 12) },
+ { AV_PIX_FMT_BGR444LE, MKTAG('B', 'G', 'R', 12) },
+ { AV_PIX_FMT_RGB444BE, MKTAG(12 , 'B', 'G', 'R') },
+ { AV_PIX_FMT_BGR444BE, MKTAG(12 , 'R', 'G', 'B') },
+ { AV_PIX_FMT_RGBA64LE, MKTAG('R', 'B', 'A', 64 ) },
+ { AV_PIX_FMT_BGRA64LE, MKTAG('B', 'R', 'A', 64 ) },
+ { AV_PIX_FMT_RGBA64BE, MKTAG(64 , 'R', 'B', 'A') },
+ { AV_PIX_FMT_BGRA64BE, MKTAG(64 , 'B', 'R', 'A') },
+ { AV_PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') },
+ { AV_PIX_FMT_RGB0, MKTAG('R', 'G', 'B', 0 ) },
+ { AV_PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') },
+ { AV_PIX_FMT_BGR0, MKTAG('B', 'G', 'R', 0 ) },
+ { AV_PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') },
+ { AV_PIX_FMT_0BGR, MKTAG( 0 , 'B', 'G', 'R') },
+ { AV_PIX_FMT_ARGB, MKTAG('A', 'R', 'G', 'B') },
+ { AV_PIX_FMT_0RGB, MKTAG( 0 , 'R', 'G', 'B') },
+ { AV_PIX_FMT_RGB24, MKTAG('R', 'G', 'B', 24 ) },
+ { AV_PIX_FMT_BGR24, MKTAG('B', 'G', 'R', 24 ) },
+ { AV_PIX_FMT_YUV411P, MKTAG('4', '1', '1', 'P') },
+ { AV_PIX_FMT_YUV422P, MKTAG('4', '2', '2', 'P') },
+ { AV_PIX_FMT_YUVJ422P, MKTAG('4', '2', '2', 'P') },
+ { AV_PIX_FMT_YUV440P, MKTAG('4', '4', '0', 'P') },
+ { AV_PIX_FMT_YUVJ440P, MKTAG('4', '4', '0', 'P') },
+ { AV_PIX_FMT_YUV444P, MKTAG('4', '4', '4', 'P') },
+ { AV_PIX_FMT_YUVJ444P, MKTAG('4', '4', '4', 'P') },
+ { AV_PIX_FMT_MONOWHITE, MKTAG('B', '1', 'W', '0') },
+ { AV_PIX_FMT_MONOBLACK, MKTAG('B', '0', 'W', '1') },
+ { AV_PIX_FMT_BGR8, MKTAG('B', 'G', 'R', 8 ) },
+ { AV_PIX_FMT_RGB8, MKTAG('R', 'G', 'B', 8 ) },
+ { AV_PIX_FMT_BGR4, MKTAG('B', 'G', 'R', 4 ) },
+ { AV_PIX_FMT_RGB4, MKTAG('R', 'G', 'B', 4 ) },
+ { AV_PIX_FMT_RGB4_BYTE, MKTAG('B', '4', 'B', 'Y') },
+ { AV_PIX_FMT_BGR4_BYTE, MKTAG('R', '4', 'B', 'Y') },
+ { AV_PIX_FMT_RGB48LE, MKTAG('R', 'G', 'B', 48 ) },
+ { AV_PIX_FMT_RGB48BE, MKTAG( 48, 'R', 'G', 'B') },
+ { AV_PIX_FMT_BGR48LE, MKTAG('B', 'G', 'R', 48 ) },
+ { AV_PIX_FMT_BGR48BE, MKTAG( 48, 'B', 'G', 'R') },
+ { AV_PIX_FMT_GRAY9LE, MKTAG('Y', '1', 0 , 9 ) },
+ { AV_PIX_FMT_GRAY9BE, MKTAG( 9 , 0 , '1', 'Y') },
+ { AV_PIX_FMT_GRAY10LE, MKTAG('Y', '1', 0 , 10 ) },
+ { AV_PIX_FMT_GRAY10BE, MKTAG(10 , 0 , '1', 'Y') },
+ { AV_PIX_FMT_GRAY12LE, MKTAG('Y', '1', 0 , 12 ) },
+ { AV_PIX_FMT_GRAY12BE, MKTAG(12 , 0 , '1', 'Y') },
+ { AV_PIX_FMT_GRAY14LE, MKTAG('Y', '1', 0 , 14 ) },
+ { AV_PIX_FMT_GRAY14BE, MKTAG(14 , 0 , '1', 'Y') },
+ { AV_PIX_FMT_GRAY16LE, MKTAG('Y', '1', 0 , 16 ) },
+ { AV_PIX_FMT_GRAY16BE, MKTAG(16 , 0 , '1', 'Y') },
+ { AV_PIX_FMT_YUV420P9LE, MKTAG('Y', '3', 11 , 9 ) },
+ { AV_PIX_FMT_YUV420P9BE, MKTAG( 9 , 11 , '3', 'Y') },
+ { AV_PIX_FMT_YUV422P9LE, MKTAG('Y', '3', 10 , 9 ) },
+ { AV_PIX_FMT_YUV422P9BE, MKTAG( 9 , 10 , '3', 'Y') },
+ { AV_PIX_FMT_YUV444P9LE, MKTAG('Y', '3', 0 , 9 ) },
+ { AV_PIX_FMT_YUV444P9BE, MKTAG( 9 , 0 , '3', 'Y') },
+ { AV_PIX_FMT_YUV420P10LE, MKTAG('Y', '3', 11 , 10 ) },
+ { AV_PIX_FMT_YUV420P10BE, MKTAG(10 , 11 , '3', 'Y') },
+ { AV_PIX_FMT_YUV422P10LE, MKTAG('Y', '3', 10 , 10 ) },
+ { AV_PIX_FMT_YUV422P10BE, MKTAG(10 , 10 , '3', 'Y') },
+ { AV_PIX_FMT_YUV444P10LE, MKTAG('Y', '3', 0 , 10 ) },
+ { AV_PIX_FMT_YUV444P10BE, MKTAG(10 , 0 , '3', 'Y') },
+ { AV_PIX_FMT_YUV420P12LE, MKTAG('Y', '3', 11 , 12 ) },
+ { AV_PIX_FMT_YUV420P12BE, MKTAG(12 , 11 , '3', 'Y') },
+ { AV_PIX_FMT_YUV422P12LE, MKTAG('Y', '3', 10 , 12 ) },
+ { AV_PIX_FMT_YUV422P12BE, MKTAG(12 , 10 , '3', 'Y') },
+ { AV_PIX_FMT_YUV444P12LE, MKTAG('Y', '3', 0 , 12 ) },
+ { AV_PIX_FMT_YUV444P12BE, MKTAG(12 , 0 , '3', 'Y') },
+ { AV_PIX_FMT_YUV420P14LE, MKTAG('Y', '3', 11 , 14 ) },
+ { AV_PIX_FMT_YUV420P14BE, MKTAG(14 , 11 , '3', 'Y') },
+ { AV_PIX_FMT_YUV422P14LE, MKTAG('Y', '3', 10 , 14 ) },
+ { AV_PIX_FMT_YUV422P14BE, MKTAG(14 , 10 , '3', 'Y') },
+ { AV_PIX_FMT_YUV444P14LE, MKTAG('Y', '3', 0 , 14 ) },
+ { AV_PIX_FMT_YUV444P14BE, MKTAG(14 , 0 , '3', 'Y') },
+ { AV_PIX_FMT_YUV420P16LE, MKTAG('Y', '3', 11 , 16 ) },
+ { AV_PIX_FMT_YUV420P16BE, MKTAG(16 , 11 , '3', 'Y') },
+ { AV_PIX_FMT_YUV422P16LE, MKTAG('Y', '3', 10 , 16 ) },
+ { AV_PIX_FMT_YUV422P16BE, MKTAG(16 , 10 , '3', 'Y') },
+ { AV_PIX_FMT_YUV444P16LE, MKTAG('Y', '3', 0 , 16 ) },
+ { AV_PIX_FMT_YUV444P16BE, MKTAG(16 , 0 , '3', 'Y') },
+ { AV_PIX_FMT_YUVA420P, MKTAG('Y', '4', 11 , 8 ) },
+ { AV_PIX_FMT_YUVA422P, MKTAG('Y', '4', 10 , 8 ) },
+ { AV_PIX_FMT_YUVA444P, MKTAG('Y', '4', 0 , 8 ) },
+ { AV_PIX_FMT_YA8, MKTAG('Y', '2', 0 , 8 ) },
+ { AV_PIX_FMT_PAL8, MKTAG('P', 'A', 'L', 8 ) },
+
+ { AV_PIX_FMT_YUVA420P9LE, MKTAG('Y', '4', 11 , 9 ) },
+ { AV_PIX_FMT_YUVA420P9BE, MKTAG( 9 , 11 , '4', 'Y') },
+ { AV_PIX_FMT_YUVA422P9LE, MKTAG('Y', '4', 10 , 9 ) },
+ { AV_PIX_FMT_YUVA422P9BE, MKTAG( 9 , 10 , '4', 'Y') },
+ { AV_PIX_FMT_YUVA444P9LE, MKTAG('Y', '4', 0 , 9 ) },
+ { AV_PIX_FMT_YUVA444P9BE, MKTAG( 9 , 0 , '4', 'Y') },
+ { AV_PIX_FMT_YUVA420P10LE, MKTAG('Y', '4', 11 , 10 ) },
+ { AV_PIX_FMT_YUVA420P10BE, MKTAG(10 , 11 , '4', 'Y') },
+ { AV_PIX_FMT_YUVA422P10LE, MKTAG('Y', '4', 10 , 10 ) },
+ { AV_PIX_FMT_YUVA422P10BE, MKTAG(10 , 10 , '4', 'Y') },
+ { AV_PIX_FMT_YUVA444P10LE, MKTAG('Y', '4', 0 , 10 ) },
+ { AV_PIX_FMT_YUVA444P10BE, MKTAG(10 , 0 , '4', 'Y') },
+ { AV_PIX_FMT_YUVA422P12LE, MKTAG('Y', '4', 10 , 12 ) },
+ { AV_PIX_FMT_YUVA422P12BE, MKTAG(12 , 10 , '4', 'Y') },
+ { AV_PIX_FMT_YUVA444P12LE, MKTAG('Y', '4', 0 , 12 ) },
+ { AV_PIX_FMT_YUVA444P12BE, MKTAG(12 , 0 , '4', 'Y') },
+ { AV_PIX_FMT_YUVA420P16LE, MKTAG('Y', '4', 11 , 16 ) },
+ { AV_PIX_FMT_YUVA420P16BE, MKTAG(16 , 11 , '4', 'Y') },
+ { AV_PIX_FMT_YUVA422P16LE, MKTAG('Y', '4', 10 , 16 ) },
+ { AV_PIX_FMT_YUVA422P16BE, MKTAG(16 , 10 , '4', 'Y') },
+ { AV_PIX_FMT_YUVA444P16LE, MKTAG('Y', '4', 0 , 16 ) },
+ { AV_PIX_FMT_YUVA444P16BE, MKTAG(16 , 0 , '4', 'Y') },
+
+ { AV_PIX_FMT_GBRP, MKTAG('G', '3', 00 , 8 ) },
+ { AV_PIX_FMT_GBRP9LE, MKTAG('G', '3', 00 , 9 ) },
+ { AV_PIX_FMT_GBRP9BE, MKTAG( 9 , 00 , '3', 'G') },
+ { AV_PIX_FMT_GBRP10LE, MKTAG('G', '3', 00 , 10 ) },
+ { AV_PIX_FMT_GBRP10BE, MKTAG(10 , 00 , '3', 'G') },
+ { AV_PIX_FMT_GBRP12LE, MKTAG('G', '3', 00 , 12 ) },
+ { AV_PIX_FMT_GBRP12BE, MKTAG(12 , 00 , '3', 'G') },
+ { AV_PIX_FMT_GBRP14LE, MKTAG('G', '3', 00 , 14 ) },
+ { AV_PIX_FMT_GBRP14BE, MKTAG(14 , 00 , '3', 'G') },
+ { AV_PIX_FMT_GBRP16LE, MKTAG('G', '3', 00 , 16 ) },
+ { AV_PIX_FMT_GBRP16BE, MKTAG(16 , 00 , '3', 'G') },
+ { AV_PIX_FMT_GBRPF16LE, MKTAG('G', '3', 00 , 17 ) },
+ { AV_PIX_FMT_GBRPF16BE, MKTAG(17 , 00 , '3', 'G') },
+ { AV_PIX_FMT_GBRPF32LE, MKTAG('G', '3', 00 , 33 ) },
+ { AV_PIX_FMT_GBRPF32BE, MKTAG(33 , 00 , '3', 'G') },
+
+ { AV_PIX_FMT_GBRAP, MKTAG('G', '4', 00 , 8 ) },
+ { AV_PIX_FMT_GBRAP10LE, MKTAG('G', '4', 00 , 10 ) },
+ { AV_PIX_FMT_GBRAP10BE, MKTAG(10 , 00 , '4', 'G') },
+ { AV_PIX_FMT_GBRAP12LE, MKTAG('G', '4', 00 , 12 ) },
+ { AV_PIX_FMT_GBRAP12BE, MKTAG(12 , 00 , '4', 'G') },
+ { AV_PIX_FMT_GBRAP14LE, MKTAG('G', '4', 00 , 14 ) },
+ { AV_PIX_FMT_GBRAP14BE, MKTAG(14 , 00 , '4', 'G') },
+ { AV_PIX_FMT_GBRAP16LE, MKTAG('G', '4', 00 , 16 ) },
+ { AV_PIX_FMT_GBRAP16BE, MKTAG(16 , 00 , '4', 'G') },
+ { AV_PIX_FMT_GBRAPF16LE, MKTAG('G', '4', 00 , 17 ) },
+ { AV_PIX_FMT_GBRAPF16BE, MKTAG(17 , 00 , '4', 'G') },
+ { AV_PIX_FMT_GBRAPF32LE, MKTAG('G', '4', 00 , 33 ) },
+ { AV_PIX_FMT_GBRAPF32BE, MKTAG(33 , 00 , '4', 'G') },
+
+ { AV_PIX_FMT_XYZ12LE, MKTAG('X', 'Y', 'Z' , 36 ) },
+ { AV_PIX_FMT_XYZ12BE, MKTAG(36 , 'Z' , 'Y', 'X') },
+
+ { AV_PIX_FMT_BAYER_BGGR8, MKTAG(0xBA, 'B', 'G', 8 ) },
+ { AV_PIX_FMT_BAYER_BGGR16LE, MKTAG(0xBA, 'B', 'G', 16 ) },
+ { AV_PIX_FMT_BAYER_BGGR16BE, MKTAG(16 , 'G', 'B', 0xBA) },
+ { AV_PIX_FMT_BAYER_RGGB8, MKTAG(0xBA, 'R', 'G', 8 ) },
+ { AV_PIX_FMT_BAYER_RGGB16LE, MKTAG(0xBA, 'R', 'G', 16 ) },
+ { AV_PIX_FMT_BAYER_RGGB16BE, MKTAG(16 , 'G', 'R', 0xBA) },
+ { AV_PIX_FMT_BAYER_GBRG8, MKTAG(0xBA, 'G', 'B', 8 ) },
+ { AV_PIX_FMT_BAYER_GBRG16LE, MKTAG(0xBA, 'G', 'B', 16 ) },
+ { AV_PIX_FMT_BAYER_GBRG16BE, MKTAG(16, 'B', 'G', 0xBA) },
+ { AV_PIX_FMT_BAYER_GRBG8, MKTAG(0xBA, 'G', 'R', 8 ) },
+ { AV_PIX_FMT_BAYER_GRBG16LE, MKTAG(0xBA, 'G', 'R', 16 ) },
+ { AV_PIX_FMT_BAYER_GRBG16BE, MKTAG(16, 'R', 'G', 0xBA) },
+
+ /* quicktime */
+ { AV_PIX_FMT_YUV420P, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */
+ { AV_PIX_FMT_YUV411P, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */
+ { AV_PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') },
+ { AV_PIX_FMT_UYVY422, MKTAG('2', 'V', 'u', 'y') },
+ { AV_PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */
+ { AV_PIX_FMT_UYVY422, MKTAG('b', 'x', 'y', 'v') },
+ { AV_PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') },
+ { AV_PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') },
+ { AV_PIX_FMT_YUYV422, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
+ { AV_PIX_FMT_VYU444, MKTAG('v', '3', '0', '8') },
+ { AV_PIX_FMT_UYVA, MKTAG('v', '4', '0', '8') },
+ { AV_PIX_FMT_V30XLE, MKTAG('v', '4', '1', '0') },
+ { AV_PIX_FMT_AYUV, MKTAG('y', '4', '0', '8') },
+ { AV_PIX_FMT_RGB555LE, MKTAG('L', '5', '5', '5') },
+ { AV_PIX_FMT_RGB565LE, MKTAG('L', '5', '6', '5') },
+ { AV_PIX_FMT_RGB565BE, MKTAG('B', '5', '6', '5') },
+ { AV_PIX_FMT_BGR24, MKTAG('2', '4', 'B', 'G') },
+ { AV_PIX_FMT_BGR24, MKTAG('b', 'x', 'b', 'g') },
+ { AV_PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') },
+ { AV_PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') },
+ { AV_PIX_FMT_RGB24, MKTAG('b', 'x', 'r', 'g') },
+ { AV_PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') },
+ { AV_PIX_FMT_GRAY16BE, MKTAG('b', '1', '6', 'g') },
+ { AV_PIX_FMT_RGB48BE, MKTAG('b', '4', '8', 'r') },
+ { AV_PIX_FMT_RGBA64BE, MKTAG('b', '6', '4', 'a') },
+ { AV_PIX_FMT_BAYER_RGGB16BE, MKTAG('B', 'G', 'G', 'R') },
+
+ /* vlc */
+ { AV_PIX_FMT_YUV410P, MKTAG('I', '4', '1', '0') },
+ { AV_PIX_FMT_YUV411P, MKTAG('I', '4', '1', '1') },
+ { AV_PIX_FMT_YUV422P, MKTAG('I', '4', '2', '2') },
+ { AV_PIX_FMT_YUV440P, MKTAG('I', '4', '4', '0') },
+ { AV_PIX_FMT_YUV444P, MKTAG('I', '4', '4', '4') },
+ { AV_PIX_FMT_YUVJ420P, MKTAG('J', '4', '2', '0') },
+ { AV_PIX_FMT_YUVJ422P, MKTAG('J', '4', '2', '2') },
+ { AV_PIX_FMT_YUVJ440P, MKTAG('J', '4', '4', '0') },
+ { AV_PIX_FMT_YUVJ444P, MKTAG('J', '4', '4', '4') },
+ { AV_PIX_FMT_YUVA444P, MKTAG('Y', 'U', 'V', 'A') },
+ { AV_PIX_FMT_YUVA420P, MKTAG('I', '4', '0', 'A') },
+ { AV_PIX_FMT_YUVA422P, MKTAG('I', '4', '2', 'A') },
+ { AV_PIX_FMT_RGB8, MKTAG('R', 'G', 'B', '2') },
+ { AV_PIX_FMT_RGB555LE, MKTAG('R', 'V', '1', '5') },
+ { AV_PIX_FMT_RGB565LE, MKTAG('R', 'V', '1', '6') },
+ { AV_PIX_FMT_BGR24, MKTAG('R', 'V', '2', '4') },
+ { AV_PIX_FMT_BGR0, MKTAG('R', 'V', '3', '2') },
+ { AV_PIX_FMT_RGBA, MKTAG('A', 'V', '3', '2') },
+ { AV_PIX_FMT_YUV420P9LE, MKTAG('I', '0', '9', 'L') },
+ { AV_PIX_FMT_YUV420P9BE, MKTAG('I', '0', '9', 'B') },
+ { AV_PIX_FMT_YUV422P9LE, MKTAG('I', '2', '9', 'L') },
+ { AV_PIX_FMT_YUV422P9BE, MKTAG('I', '2', '9', 'B') },
+ { AV_PIX_FMT_YUV444P9LE, MKTAG('I', '4', '9', 'L') },
+ { AV_PIX_FMT_YUV444P9BE, MKTAG('I', '4', '9', 'B') },
+ { AV_PIX_FMT_YUV420P10LE, MKTAG('I', '0', 'A', 'L') },
+ { AV_PIX_FMT_YUV420P10BE, MKTAG('I', '0', 'A', 'B') },
+ { AV_PIX_FMT_YUV422P10LE, MKTAG('I', '2', 'A', 'L') },
+ { AV_PIX_FMT_YUV422P10BE, MKTAG('I', '2', 'A', 'B') },
+ { AV_PIX_FMT_YUV444P10LE, MKTAG('I', '4', 'A', 'L') },
+ { AV_PIX_FMT_YUV444P10BE, MKTAG('I', '4', 'A', 'B') },
+ { AV_PIX_FMT_YUV420P12LE, MKTAG('I', '0', 'C', 'L') },
+ { AV_PIX_FMT_YUV420P12BE, MKTAG('I', '0', 'C', 'B') },
+ { AV_PIX_FMT_YUV422P12LE, MKTAG('I', '2', 'C', 'L') },
+ { AV_PIX_FMT_YUV422P12BE, MKTAG('I', '2', 'C', 'B') },
+ { AV_PIX_FMT_YUV444P12LE, MKTAG('I', '4', 'C', 'L') },
+ { AV_PIX_FMT_YUV444P12BE, MKTAG('I', '4', 'C', 'B') },
+ { AV_PIX_FMT_YUV420P16LE, MKTAG('I', '0', 'F', 'L') },
+ { AV_PIX_FMT_YUV420P16BE, MKTAG('I', '0', 'F', 'B') },
+ { AV_PIX_FMT_YUV444P16LE, MKTAG('I', '4', 'F', 'L') },
+ { AV_PIX_FMT_YUV444P16BE, MKTAG('I', '4', 'F', 'B') },
+
+ /* special */
+ { AV_PIX_FMT_RGB565LE, MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */
+ { AV_PIX_FMT_YUV444P, MKTAG('Y', 'V', '2', '4') }, /* YUV444P, swapped UV */
+
+ { AV_PIX_FMT_NONE, 0 },
+};
+
+#endif /* AVCODEC_RAW_PIX_FMT_TAGS_H */
diff --git a/tools/fourcc2pixfmt.c b/tools/fourcc2pixfmt.c
index 75bb6077b5..abea0c8d84 100644
--- a/tools/fourcc2pixfmt.c
+++ b/tools/fourcc2pixfmt.c
@@ -19,14 +19,15 @@
*/
#include "config.h"
+#include <stdio.h>
#if HAVE_UNISTD_H
#include <unistd.h> /* getopt */
#endif
+#include "libavutil/avutil.h"
#include "libavutil/pixdesc.h"
-#include "libavcodec/avcodec.h"
-#include "libavutil/common.h"
#include "libavcodec/raw.h"
+#include "libavcodec/raw_pix_fmt_tags.h"
#undef printf
#undef fprintf
@@ -59,7 +60,7 @@ static void print_pix_fmt_fourccs(enum AVPixelFormat pix_fmt, const PixelFormatT
int main(int argc, char **argv)
{
int i, list_fourcc_pix_fmt = 0, list_pix_fmt_fourccs = 0;
- const PixelFormatTag *pix_fmt_tags = avpriv_get_raw_pix_fmt_tags();
+ const PixelFormatTag *pix_fmt_tags = raw_pix_fmt_tags;
const char *pix_fmt_name = NULL;
char c;
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
