From b0c59da2345beffbe6ca8fd5bc5fe459c3633fb5 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sat, 3 Mar 2007 14:11:45 +0000 Subject: [PATCH] partial avid meridien uncompressed support Originally committed as revision 8203 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/raw.c | 1 + libavformat/mov.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 36b10d321..268779803 100644 --- a/libavcodec/raw.c +++ b/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 }, }; diff --git a/libavformat/mov.c b/libavformat/mov.c index bd16cacb3..c2feb8771 100644 --- a/libavformat/mov.c +++ b/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 */ -- 2.11.0