diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-26 19:06:56 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-26 19:06:56 +0000 |
| commit | dfc63d36af082a89aa607dc500c19f92f647e43b (patch) | |
| tree | 62b9bd998d6435213fde76714008fa4044512fd8 /libmpcodecs | |
| parent | 1aeb3a74cc5dc0735fa0749140c3bac24d5e848a (diff) | |
| download | mpv-dfc63d36af082a89aa607dc500c19f92f647e43b.tar.bz2 mpv-dfc63d36af082a89aa607dc500c19f92f647e43b.tar.xz | |
"support" YUVJ colorspaces added to libavcodec, makes mjpeg decoding work again
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14598 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 9b05b15d34..dc16ad7b8f 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -483,9 +483,15 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){ sh->disp_h = avctx->height; ctx->vo_inited=1; switch(pix_fmt){ + // YUVJ are YUV formats that use the full Y range and not just + // 16 - 235 (see colorspaces.txt). + // Currently they are all treated the same way. case PIX_FMT_YUV410P: ctx->best_csp=IMGFMT_YVU9;break; //svq1 + case PIX_FMT_YUVJ420P: case PIX_FMT_YUV420P: ctx->best_csp=IMGFMT_YV12;break; //mpegs + case PIX_FMT_YUVJ422P: case PIX_FMT_YUV422P: ctx->best_csp=IMGFMT_422P;break; //mjpeg / huffyuv + case PIX_FMT_YUVJ444P: case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //photo jpeg case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc case PIX_FMT_YUV422: ctx->best_csp=IMGFMT_YUY2;break; //huffyuv perhaps in the future |