[FFmpeg-cvslog] r21223 - in trunk: libavcodec/raw.c libavformat/isom.c

[cehoyos]

Author: cehoyos
Date: Fri Jan 15 12:03:40 2010
New Revision: 21223

Log:
Support decoding of Avid uncompressed mov files, fixes issue 1685.

Modified:
   trunk/libavcodec/raw.c
   trunk/libavformat/isom.c

Modified: trunk/libavcodec/raw.c
==============================================================================
--- trunk/libavcodec/raw.c	Fri Jan 15 11:55:31 2010	(r21222)
+++ trunk/libavcodec/raw.c	Fri Jan 15 12:03:40 2010	(r21223)
@@ -53,6 +53,7 @@ const PixelFormatTag ff_raw_pixelFormatT
     { 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_GRAY8,   MKTAG('G', 'R', 'E', 'Y') },
     { PIX_FMT_RGB555,  MKTAG('R', 'G', 'B', 15) },
     { PIX_FMT_BGR555,  MKTAG('B', 'G', 'R', 15) },

Modified: trunk/libavformat/isom.c
==============================================================================
--- trunk/libavformat/isom.c	Fri Jan 15 11:55:31 2010	(r21222)
+++ trunk/libavformat/isom.c	Fri Jan 15 12:03:40 2010	(r21223)
@@ -172,6 +172,7 @@ const AVCodecTag codec_movvideo_tags[] =
     { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
     { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */
     { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', '1', 'x') }, /* AVID 1:1x */
+    { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') },
     { CODEC_ID_SGI,   MKTAG('s', 'g', 'i', ' ') }, /* SGI  */
     { CODEC_ID_DPX,   MKTAG('d', 'p', 'x', ' ') }, /* DPX */