[FFmpeg-cvslog] r21218 - in trunk/libavcodec: raw.c rawdec.c

[cehoyos]

Author: cehoyos
Date: Fri Jan 15 01:45:47 2010
New Revision: 21218

Log:
Do not assign codec_tag to pix_fmt in rawdec.c, but in raw.c

Modified:
   trunk/libavcodec/raw.c
   trunk/libavcodec/rawdec.c

Modified: trunk/libavcodec/raw.c
==============================================================================
--- trunk/libavcodec/raw.c	Thu Jan 14 20:58:12 2010	(r21217)
+++ trunk/libavcodec/raw.c	Fri Jan 15 01:45:47 2010	(r21218)
@@ -51,6 +51,7 @@ const PixelFormatTag ff_raw_pixelFormatT
     { 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_GRAY8,   MKTAG('G', 'R', 'E', 'Y') },
     { PIX_FMT_RGB555,  MKTAG('R', 'G', 'B', 15) },
     { PIX_FMT_BGR555,  MKTAG('B', 'G', 'R', 15) },

Modified: trunk/libavcodec/rawdec.c
==============================================================================
--- trunk/libavcodec/rawdec.c	Thu Jan 14 20:58:12 2010	(r21217)
+++ trunk/libavcodec/rawdec.c	Fri Jan 15 01:45:47 2010	(r21218)
@@ -74,8 +74,6 @@ static av_cold int raw_init_decoder(AVCo
 
     if (avctx->codec_tag == MKTAG('r','a','w',' '))
         avctx->pix_fmt = findPixelFormat(pixelFormatBpsMOV, avctx->bits_per_coded_sample);
-    else if (avctx->codec_tag == MKTAG('A', 'V', 'R', 'n'))
-        avctx->pix_fmt = PIX_FMT_UYVY422; // Avid AVI Codec "Resolution 1:1"
     else if (avctx->codec_tag)
         avctx->pix_fmt = findPixelFormat(ff_raw_pixelFormatTags, avctx->codec_tag);
     else if (avctx->bits_per_coded_sample)