Browse Source

partial avid meridien uncompressed support

Originally committed as revision 8203 to svn://svn.ffmpeg.org/ffmpeg/trunk
Baptiste Coudurier 18 years ago
parent
commit
b0c59da234
2 changed files with 2 additions and 1 deletions
  1. 1 0
      libavcodec/raw.c
  2. 1 1
      libavformat/mov.c

+ 1 - 0
libavcodec/raw.c

@@ -59,6 +59,7 @@ static const PixelFormatTag pixelFormatTags[] = {
 
     /* quicktime */
     { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') },
+    { PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */
 
     { -1, 0 },
 };

+ 1 - 1
libavformat/mov.c

@@ -70,7 +70,7 @@ static const AVCodecTag mov_video_tags[] = {
 /*  { CODEC_ID_, MKTAG('c', 'v', 'i', 'd') }, *//* Cinepak */
     { CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */
 /*  { CODEC_ID_H263, MKTAG('Y', 'u', 'v', '2') }, *//* Uncompressed YUV422 */
-/*    { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, *//* YUV with alpha-channel (AVID Uncompressed) */
+    { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, /* YUV with alpha-channel (AVID Uncompressed) */
 /* Graphics */
 /* Animation */
 /* Apple video */