Commit ede926ea authored by cehoyos's avatar cehoyos

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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21223 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 2044e9a0
...@@ -53,6 +53,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { ...@@ -53,6 +53,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
{ PIX_FMT_UYVY422, MKTAG('2', 'V', 'u', '1') }, { 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', 'R', 'n') }, /* Avid AVI Codec 1:1 */
{ PIX_FMT_UYVY422, MKTAG('A', 'V', '1', 'x') }, /* Avid 1:1x */ { 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_GRAY8, MKTAG('G', 'R', 'E', 'Y') },
{ PIX_FMT_RGB555, MKTAG('R', 'G', 'B', 15) }, { PIX_FMT_RGB555, MKTAG('R', 'G', 'B', 15) },
{ PIX_FMT_BGR555, MKTAG('B', 'G', 'R', 15) }, { PIX_FMT_BGR555, MKTAG('B', 'G', 'R', 15) },
......
...@@ -172,6 +172,7 @@ const AVCodecTag codec_movvideo_tags[] = { ...@@ -172,6 +172,7 @@ const AVCodecTag codec_movvideo_tags[] = {
{ CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
{ CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */ { 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', '1', 'x') }, /* AVID 1:1x */
{ CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') },
{ CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */ { CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */
{ CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, /* DPX */ { CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, /* DPX */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment