Rename ff_parse_eval() to ff_eval_expr().

[ffmpeg] / libavcodec / raw.c

diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 48b2093779f518195cf953b654022a354b60d8a6..91aba494218eab0edc1e10d089bf3eee8c7884b5 100644 (file)
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -43,6 +43,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
     { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */
     { PIX_FMT_YUYV422, MKTAG('Y', '4', '2', '2') },
     { PIX_FMT_YUYV422, MKTAG('V', '4', '2', '2') },
+    { PIX_FMT_YUYV422, MKTAG('V', 'Y', 'U', 'Y') },
     { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'N', 'V') },
     { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') },
     { PIX_FMT_UYVY422, MKTAG('H', 'D', 'Y', 'C') },
@@ -50,6 +51,10 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
     { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'Y') },
     { PIX_FMT_UYVY422, MKTAG('u', 'y', 'v', '1') },
     { PIX_FMT_UYVY422, MKTAG('2', 'V', 'u', '1') },
+    { PIX_FMT_UYVY422, MKTAG('A', 'V', 'R', 'n') }, /* Avid AVI Codec 1:1 */
+    { PIX_FMT_UYVY422, MKTAG('A', 'V', '1', 'x') }, /* Avid 1:1x */
+    { PIX_FMT_UYVY422, MKTAG('A', 'V', 'u', 'p') },
+    { PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
     { PIX_FMT_GRAY8,   MKTAG('G', 'R', 'E', 'Y') },
     { PIX_FMT_RGB555,  MKTAG('R', 'G', 'B', 15) },
     { PIX_FMT_BGR555,  MKTAG('B', 'G', 'R', 15) },
@@ -59,8 +64,10 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
 
     /* quicktime */
     { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') },
+    { PIX_FMT_UYVY422, MKTAG('2', 'V', 'u', 'y') },
     { PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */
     { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') },
+    { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') },
     { PIX_FMT_PAL8,    MKTAG('W', 'R', 'A', 'W') },
 
     { PIX_FMT_NONE, 0 },