Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / raw.c

diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 42469fdf650ce73eb0d2ff0db1a5b6c8e7f7ceab..ec532a32c4e443641dd1a693d4fbd7f71875ce06 100644 (file)
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -63,6 +63,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
     { PIX_FMT_UYVY422, MKTAG('A', 'V', 'u', 'p') },
     { PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
     { PIX_FMT_UYVY422, MKTAG('a', 'u', 'v', '2') },
+    { PIX_FMT_UYVY422, MKTAG('c', 'y', 'u', 'v') }, /* CYUV is also Creative YUV */
     { PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') },
     { PIX_FMT_GRAY8,   MKTAG('G', 'R', 'E', 'Y') },
     { PIX_FMT_NV12,    MKTAG('N', 'V', '1', '2') },
@@ -81,10 +82,18 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
     { PIX_FMT_BGR444LE, MKTAG('B', 'G', 'R', 12) },
     { PIX_FMT_RGB444BE, MKTAG(12 , 'B', 'G', 'R') },
     { PIX_FMT_BGR444BE, MKTAG(12 , 'R', 'G', 'B') },
+    { PIX_FMT_RGBA64LE, MKTAG('R', 'B', 'A', 64 ) },
+    { PIX_FMT_BGRA64LE, MKTAG('B', 'R', 'A', 64 ) },
+    { PIX_FMT_RGBA64BE, MKTAG(64 , 'R', 'B', 'A') },
+    { PIX_FMT_BGRA64BE, MKTAG(64 , 'B', 'R', 'A') },
     { PIX_FMT_RGBA,     MKTAG('R', 'G', 'B', 'A') },
+    { PIX_FMT_RGB0,     MKTAG('R', 'G', 'B',  0 ) },
     { PIX_FMT_BGRA,     MKTAG('B', 'G', 'R', 'A') },
+    { PIX_FMT_BGR0,     MKTAG('B', 'G', 'R',  0 ) },
     { PIX_FMT_ABGR,     MKTAG('A', 'B', 'G', 'R') },
+    { PIX_FMT_0BGR,     MKTAG( 0 , 'B', 'G', 'R') },
     { PIX_FMT_ARGB,     MKTAG('A', 'R', 'G', 'B') },
+    { PIX_FMT_0RGB,     MKTAG( 0 , 'R', 'G', 'B') },
     { PIX_FMT_RGB24,    MKTAG('R', 'G', 'B', 24 ) },
     { PIX_FMT_BGR24,    MKTAG('B', 'G', 'R', 24 ) },
     { PIX_FMT_YUV411P,  MKTAG('4', '1', '1', 'P') },