Mercurial > libavcodec.hg
changeset 10880:1184d065c26a libavcodec
Do not assign codec_tag to pix_fmt in rawdec.c, but in raw.c
| author | cehoyos |
|---|---|
| date | Fri, 15 Jan 2010 00:45:47 +0000 |
| parents | 7d46c481d045 |
| children | 798c62217427 |
| files | raw.c rawdec.c |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/raw.c Thu Jan 14 17:50:33 2010 +0000 +++ b/raw.c Fri Jan 15 00:45:47 2010 +0000 @@ -51,6 +51,7 @@ { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'Y') }, { PIX_FMT_UYVY422, MKTAG('u', 'y', 'v', '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_RGB555, MKTAG('R', 'G', 'B', 15) }, { PIX_FMT_BGR555, MKTAG('B', 'G', 'R', 15) },
--- a/rawdec.c Thu Jan 14 17:50:33 2010 +0000 +++ b/rawdec.c Fri Jan 15 00:45:47 2010 +0000 @@ -74,8 +74,6 @@ if (avctx->codec_tag == MKTAG('r','a','w',' ')) 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) avctx->pix_fmt = findPixelFormat(ff_raw_pixelFormatTags, avctx->codec_tag); else if (avctx->bits_per_coded_sample)