diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-01-15 11:03:40 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-01-15 11:03:40 +0000 |
| commit | 59ea69ef54c658e33e5bce911a218e78bec36c02 (patch) | |
| tree | b6f942f42aa56c79f19c4f5ca2c7b1fa2167ff56 | |
| parent | a0ae3e41f3ba58793df40487dcfe96070cf999bf (diff) | |
| download | ffmpeg-59ea69ef54c658e33e5bce911a218e78bec36c02.tar.gz | |
Support decoding of Avid uncompressed mov files, fixes issue 1685.
Originally committed as revision 21223 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/raw.c | 1 | ||||
| -rw-r--r-- | libavformat/isom.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 4ea19d380b..b47737a665 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -53,6 +53,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { { 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) }, diff --git a/libavformat/isom.c b/libavformat/isom.c index d98d91707e..9318facb59 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -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 */ |