Commit c78dfcda authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

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

Originally committed as revision 21218 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3bfbbef6
...@@ -51,6 +51,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { ...@@ -51,6 +51,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
{ PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'Y') }, { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'Y') },
{ PIX_FMT_UYVY422, MKTAG('u', 'y', 'v', '1') }, { PIX_FMT_UYVY422, MKTAG('u', 'y', 'v', '1') },
{ 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_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) },
......
...@@ -74,8 +74,6 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) ...@@ -74,8 +74,6 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
if (avctx->codec_tag == MKTAG('r','a','w',' ')) if (avctx->codec_tag == MKTAG('r','a','w',' '))
avctx->pix_fmt = findPixelFormat(pixelFormatBpsMOV, avctx->bits_per_coded_sample); 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) else if (avctx->codec_tag)
avctx->pix_fmt = findPixelFormat(ff_raw_pixelFormatTags, avctx->codec_tag); avctx->pix_fmt = findPixelFormat(ff_raw_pixelFormatTags, avctx->codec_tag);
else if (avctx->bits_per_coded_sample) else if (avctx->bits_per_coded_sample)
......
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