diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-05-26 03:51:00 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-05-26 03:51:00 +0000 |
| commit | 71b0654cc6693a8c925966cfb88ec62c1052609f (patch) | |
| tree | 74eb7387cf21ba7b648f8bfeefe3df78dc14b902 | |
| parent | f9928b7e80822224dfb700e0ffe022e746077b76 (diff) | |
Support YVU9 AVI 4cc.
Fixes issue1068.
Originally committed as revision 18952 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/raw.c | 1 | ||||
| -rw-r--r-- | libavcodec/rawdec.c | 3 | ||||
| -rw-r--r-- | libavformat/riff.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index c79c0125f7..c0cc56dd80 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -32,6 +32,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { { PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') }, { PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') }, { PIX_FMT_YUV410P, MKTAG('Y', 'U', 'V', '9') }, + { PIX_FMT_YUV410P, MKTAG('Y', 'V', 'U', '9') }, { PIX_FMT_YUV411P, MKTAG('Y', '4', '1', 'B') }, { PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') }, { PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') }, diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index ebd9ded3e4..89e9ea936b 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -139,7 +139,8 @@ static int raw_decode(AVCodecContext *avctx, if(context->flip) flip(avctx, picture); - if (avctx->codec_tag == MKTAG('Y', 'V', '1', '2')) + if ( avctx->codec_tag == MKTAG('Y', 'V', '1', '2') + || avctx->codec_tag == MKTAG('Y', 'V', 'U', '9')) { // swap fields unsigned char *tmp = picture->data[1]; diff --git a/libavformat/riff.c b/libavformat/riff.c index 1a05f84566..858c924b7e 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -141,6 +141,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_RAWVIDEO, MKTAG('I', 'Y', 'U', 'V') }, { CODEC_ID_RAWVIDEO, MKTAG('Y', '8', '0', '0') }, { CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') }, { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, |