From 60ab582a4e87f1d668c41b886200474fdc4bac83 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 6 Jan 2014 19:47:34 +0100 Subject: [PATCH] avcodec/huffyuv: add GRAY8 support Signed-off-by: Michael Niedermayer --- libavcodec/huffyuvdec.c | 3 +++ libavcodec/huffyuvenc.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 383b0f0122..b37c457b84 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -364,6 +364,9 @@ static av_cold int decode_init(AVCodecContext *avctx) &s->chroma_v_shift); } else { switch ( (s->chroma<<10) | (s->yuv<<9) | (s->alpha<<8) | ((s->bps-1)<<4) | s->chroma_h_shift | (s->chroma_v_shift<<2)) { + case 0x070: + avctx->pix_fmt = AV_PIX_FMT_GRAY8; + break; case 0x470: avctx->pix_fmt = AV_PIX_FMT_GBRP; break; diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index d8827cfa4b..4684896078 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -187,6 +187,7 @@ static av_cold int encode_init(AVCodecContext *avctx) case AV_PIX_FMT_YUV411P: case AV_PIX_FMT_YUV440P: case AV_PIX_FMT_GBRP: + case AV_PIX_FMT_GRAY8: s->version = 3; break; case AV_PIX_FMT_RGB32: @@ -858,6 +859,7 @@ AVCodec ff_ffvhuff_encoder = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_GBRP, + AV_PIX_FMT_GRAY8, AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE },