diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-01-15 00:45:47 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-01-15 00:45:47 +0000 |
| commit | c78dfcdaf41b66c651d64fc1289f71ce9404e970 (patch) | |
| tree | 6b540bab10a3f94be80cede6439d7775037da558 /libavcodec | |
| parent | 3bfbbef64df9c69c6d1ccbc40a16daac55f8652a (diff) | |
| download | ffmpeg-c78dfcdaf41b66c651d64fc1289f71ce9404e970.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/raw.c | 1 | ||||
| -rw-r--r-- | libavcodec/rawdec.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index ee3edb6da7..172a8d3a38 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -51,6 +51,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { { 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) }, diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 47fcc7081a..fe96440fce 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -74,8 +74,6 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) 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) |