diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-01-06 00:59:08 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-01-06 00:59:08 +0100 |
| commit | 09f25a9cb08ddf39dcb16898c36ed793006093fd (patch) | |
| tree | 3fc44b5d482f6d41dba72890e0271817b13babc0 /libavcodec | |
| parent | d185278c369e9150fe6b4cf730405753384bca93 (diff) | |
| download | ffmpeg-09f25a9cb08ddf39dcb16898c36ed793006093fd.tar.gz | |
Allow decoding of uyvy422 CYUV with -vcodec rawvideo.
FourCC CYUV can be Creative YUV and uyvy422 rawvideo.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/raw.c | 1 | ||||
| -rw-r--r-- | libavcodec/rawdec.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 42469fdf65..cfa650ee6b 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -63,6 +63,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_UYVY422, MKTAG('A', 'V', 'u', 'p') }, { PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */ { PIX_FMT_UYVY422, MKTAG('a', 'u', 'v', '2') }, + { PIX_FMT_UYVY422, MKTAG('c', 'y', 'u', 'v') }, /* CYUV is also Creative YUV */ { PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') }, { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, { PIX_FMT_NV12, MKTAG('N', 'V', '1', '2') }, diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index acaa0ea732..e48e3850be 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -119,6 +119,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) avctx->coded_frame= &context->pic; if((avctx->extradata_size >= 9 && !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) || + avctx->codec_tag == MKTAG('c','y','u','v') || avctx->codec_tag == MKTAG(3, 0, 0, 0) || avctx->codec_tag == MKTAG('W','R','A','W')) context->flip=1; |