# HG changeset patch # User rtognimp # Date 1139440949 0 # Node ID 7b7b7552fcbb414425ec9d3a59d19ec35e222954 # Parent 1a54f39404b96c6d861516668325cb9fa926e461 Add support for grayscale [m]jpeg diff -r 1a54f39404b9 -r 7b7b7552fcbb etc/codecs.conf --- a/etc/codecs.conf Wed Feb 08 13:14:19 2006 +0000 +++ b/etc/codecs.conf Wed Feb 08 23:22:29 2006 +0000 @@ -799,6 +799,7 @@ out YUY2 ; queried (conversion from yuv422p) out YV12,I420,IYUV out BGR32 ; lossless JPEG + out Y800 videocodec ffmjpegb info "FFmpeg MJPEG-B decoder" diff -r 1a54f39404b9 -r 7b7b7552fcbb libmpcodecs/vd_ffmpeg.c --- a/libmpcodecs/vd_ffmpeg.c Wed Feb 08 13:14:19 2006 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Wed Feb 08 23:22:29 2006 +0000 @@ -560,6 +560,7 @@ 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;