Store original width/height so that rv20 does not get stuck with some

[ffmpeg] / libavcodec / raw.c

diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index c88830cafc3773f7da7312079dea5be137a88cef..ee3edb6da7d4aa6a87a891874ca6ea4194faf3ee 100644 (file)
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -1,6 +1,6 @@
 /*
  * Raw Video Codec
- * Copyright (c) 2001 Fabrice Bellard.
+ * Copyright (c) 2001 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file raw.c
+ * @file libavcodec/raw.c
  * Raw Video Codec
  */
 
@@ -32,25 +32,38 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
     { PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') },
     { PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') },
     { PIX_FMT_YUV410P, MKTAG('Y', 'U', 'V', '9') },
+    { PIX_FMT_YUV410P, MKTAG('Y', 'V', 'U', '9') },
     { PIX_FMT_YUV411P, MKTAG('Y', '4', '1', 'B') },
     { PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') },
+    { PIX_FMT_YUV422P, MKTAG('P', '4', '2', '2') },
     { PIX_FMT_GRAY8,   MKTAG('Y', '8', '0', '0') },
     { PIX_FMT_GRAY8,   MKTAG(' ', ' ', 'Y', '8') },
 
 
     { 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') },
+    { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'V') },
+    { 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_GRAY8,   MKTAG('G', 'R', 'E', 'Y') },
     { PIX_FMT_RGB555,  MKTAG('R', 'G', 'B', 15) },
     { PIX_FMT_BGR555,  MKTAG('B', 'G', 'R', 15) },
     { PIX_FMT_RGB565,  MKTAG('R', 'G', 'B', 16) },
     { PIX_FMT_BGR565,  MKTAG('B', 'G', 'R', 16) },
+    { PIX_FMT_RGB565,  MKTAG( 3 ,  0 ,  0 ,  0 ) },
 
     /* quicktime */
     { 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 },
 };