summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf1
-rw-r--r--libmpcodecs/vd_ffmpeg.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index ac5773640c..6f371b6327 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -799,6 +799,7 @@ videocodec ffmjpeg
out YUY2 ; queried (conversion from yuv422p)
out YV12,I420,IYUV
out BGR32 ; lossless JPEG
+ out Y800
videocodec ffmjpegb
info "FFmpeg MJPEG-B decoder"
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 21e1d9626b..b96973d45e 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -560,6 +560,7 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){
case PIX_FMT_BGR24 : ctx->best_csp=IMGFMT_BGR24;break; //8bps
case PIX_FMT_RGB555: ctx->best_csp=IMGFMT_BGR15;break; //rpza,cram
case PIX_FMT_RGB565: ctx->best_csp=IMGFMT_BGR16;break; //4xm
+ case PIX_FMT_GRAY8: ctx->best_csp=IMGFMT_Y800;break; // gray jpeg
case PIX_FMT_PAL8: ctx->best_csp=IMGFMT_BGR8;break; //8bps,mrle,cram
#ifdef HAVE_XVMC
case PIX_FMT_XVMC_MPEG2_MC:ctx->best_csp=IMGFMT_XVMC_MOCO_MPEG2;break;