diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-14 19:27:51 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-14 19:27:51 +0000 |
| commit | eb2caba06c9298db7be310565f676483195c7306 (patch) | |
| tree | b0784bf92fa2955ca21aedd10ddce5f506ab235c /libmpcodecs/vd_ffmpeg.c | |
| parent | 2e30fba2688a878d3023003d1cba06a07b975490 (diff) | |
| download | mpv-eb2caba06c9298db7be310565f676483195c7306.tar.bz2 mpv-eb2caba06c9298db7be310565f676483195c7306.tar.xz | |
ffhuffyuv
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8191 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 5c06741627..40da15e4e0 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -236,6 +236,7 @@ static int init(sh_video_t *sh){ if (sh->bih && (sh->bih->biSize != sizeof(BITMAPINFOHEADER)) && (sh->format == mmioFOURCC('M','4','S','2') || sh->format == mmioFOURCC('M','P','4','S') || + sh->format == mmioFOURCC('H','F','Y','U') || sh->format == mmioFOURCC('W','M','V','2') )) { @@ -243,6 +244,10 @@ static int init(sh_video_t *sh){ avctx->extradata = malloc(avctx->extradata_size); memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); } + +#if LIBAVCODEC_BUILD >= 4639 + avctx->bits_per_sample= sh->bih->biBitCount; +#endif /* open it */ if (avcodec_open(avctx, lavc_codec) < 0) { @@ -361,12 +366,14 @@ static int init_vo(sh_video_t *sh){ case PIX_FMT_YUV410P: ctx->best_csp=IMGFMT_YVU9;break; //svq1 #endif case PIX_FMT_YUV420P: ctx->best_csp=IMGFMT_YV12;break; //mpegs - case PIX_FMT_YUV422P: ctx->best_csp=IMGFMT_422P;break; //mjpeg + case PIX_FMT_YUV422P: ctx->best_csp=IMGFMT_422P;break; //mjpeg / huffyuv case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //??? #if LIBAVCODEC_BUILD >= 4631 case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc #endif - case PIX_FMT_YUV422: ctx->best_csp=IMGFMT_YUY2;break; //??? + case PIX_FMT_YUV422: ctx->best_csp=IMGFMT_YUY2;break; //huffyuv perhaps in the future + case PIX_FMT_BGR24 : ctx->best_csp=IMGFMT_BGR24;break; //huffyuv + case PIX_FMT_BGRA32: ctx->best_csp=IMGFMT_BGR32;break; //huffyuv default: ctx->best_csp=0; } |