summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-16 17:43:24 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-16 17:43:24 +0100
commit3d87927959bac2763087d193de1568c149a9405a (patch)
treec29912a9d8b39579bfb84b15a999590b43d1bfda
parentef0282125cf4cc373ddbc177939d17857bb6b31b (diff)
downloadffmpeg-streaming-3d87927959bac2763087d193de1568c149a9405a.zip
ffmpeg-streaming-3d87927959bac2763087d193de1568c149a9405a.tar.gz
avcodec/huffyuv: add YUVA{420,422,444}P{9,10} support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/huffyuvdec.c15
-rw-r--r--libavcodec/huffyuvenc.c9
2 files changed, 24 insertions, 0 deletions
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index 2d9d12c..c1e029d 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -441,12 +441,27 @@ static av_cold int decode_init(AVCodecContext *avctx)
case 0x770:
avctx->pix_fmt = AV_PIX_FMT_YUVA444P;
break;
+ case 0x780:
+ avctx->pix_fmt = AV_PIX_FMT_YUVA444P9;
+ break;
+ case 0x790:
+ avctx->pix_fmt = AV_PIX_FMT_YUVA444P10;
+ break;
case 0x771:
avctx->pix_fmt = AV_PIX_FMT_YUVA422P;
break;
+ case 0x781:
+ avctx->pix_fmt = AV_PIX_FMT_YUVA422P9;
+ break;
+ case 0x791:
+ avctx->pix_fmt = AV_PIX_FMT_YUVA422P10;
+ break;
case 0x775:
avctx->pix_fmt = AV_PIX_FMT_YUVA420P;
break;
+ case 0x785:
+ avctx->pix_fmt = AV_PIX_FMT_YUVA420P9;
+ break;
case 0x795:
avctx->pix_fmt = AV_PIX_FMT_YUVA420P10;
break;
diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c
index 3175f79..5a690c1 100644
--- a/libavcodec/huffyuvenc.c
+++ b/libavcodec/huffyuvenc.c
@@ -264,6 +264,12 @@ static av_cold int encode_init(AVCodecContext *avctx)
case AV_PIX_FMT_YUV444P10:
case AV_PIX_FMT_YUV444P12:
case AV_PIX_FMT_YUV444P14:
+ case AV_PIX_FMT_YUVA420P9:
+ case AV_PIX_FMT_YUVA420P10:
+ case AV_PIX_FMT_YUVA422P9:
+ case AV_PIX_FMT_YUVA422P10:
+ case AV_PIX_FMT_YUVA444P9:
+ case AV_PIX_FMT_YUVA444P10:
s->version = 3;
break;
case AV_PIX_FMT_RGB32:
@@ -962,6 +968,9 @@ AVCodec ff_ffvhuff_encoder = {
AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV420P14,
AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV422P14,
AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV444P14,
+ AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA420P10,
+ AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA422P10,
+ AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA444P10,
AV_PIX_FMT_RGB24,
AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
},
OpenPOWER on IntegriCloud