aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorami_stuff <ami_stuff@o2.pl>2011-07-06 10:05:08 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-07-06 10:05:08 +0200
commit3950376b8baa6292f2f195dae43d7b00bcbf53e7 (patch)
treef9b76225bef33d3ec7e3612f14ca6cc50b1d3d95
parent923cff747a0f31b0e120e1899a4b807fb8137484 (diff)
downloadffmpeg-3950376b8baa6292f2f195dae43d7b00bcbf53e7.tar.gz
Support fourcc YV24.
Fixes ticket #306.
-rw-r--r--libavcodec/raw.c1
-rw-r--r--libavcodec/rawdec.c1
-rw-r--r--libavformat/riff.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index d6867186ad..e87a9af2ba 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -137,6 +137,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
/* special */
{ PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */
+ { PIX_FMT_YUV444P, MKTAG('Y', 'V', '2', '4') }, /* YUV444P, swapped UV */
{ PIX_FMT_NONE, 0 },
};
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index d48cbed3e7..177f08cb93 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -208,6 +208,7 @@ static int raw_decode(AVCodecContext *avctx,
if ( avctx->codec_tag == MKTAG('Y', 'V', '1', '2')
|| avctx->codec_tag == MKTAG('Y', 'V', '1', '6')
+ || avctx->codec_tag == MKTAG('Y', 'V', '2', '4')
|| avctx->codec_tag == MKTAG('Y', 'V', 'U', '9'))
FFSWAP(uint8_t *, picture->data[1], picture->data[2]);
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 060eaa0728..2e00ae8963 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -173,6 +173,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('P', '4', '2', '2') },
{ CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '2') },
{ CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '6') },
+ { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '2', '4') },
{ CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') },
{ CODEC_ID_RAWVIDEO, MKTAG('V', 'Y', 'U', 'Y') },
{ CODEC_ID_RAWVIDEO, MKTAG('I', 'Y', 'U', 'V') },