From ca774d892bc353fe884945c9341dee89f1266840 Mon Sep 17 00:00:00 2001 From: michael Date: Mon, 9 Jun 2003 02:31:04 +0000 Subject: [PATCH] FFV1 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10265 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 8 ++++++++ libmpcodecs/ve_lavc.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/etc/codecs.conf b/etc/codecs.conf index ec042cdfc8..e3deb1b1cf 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -265,6 +265,14 @@ videocodec ffhuffyuv out YUY2,422P,YV12 out BGR32,BGR24 +videocodec ffv1 + info "FFV1" + status working + fourcc FFV1 + driver ffmpeg + dll ffv1 + out 411P,444P,422P,YV12,I420,IYUV,YVU9 + videocodec ffasv1 info "ASUS V1" status working diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index c258e9bfb7..342bcf2f67 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -693,6 +693,8 @@ static int vf_open(vf_instance_t *vf, char* args){ mux_v->bih->biCompression = mmioFOURCC('H', 'F', 'Y', 'U'); else if (!strcasecmp(lavc_param_vcodec, "asv1")) mux_v->bih->biCompression = mmioFOURCC('A', 'S', 'V', '1'); + else if (!strcasecmp(lavc_param_vcodec, "ffv1")) + mux_v->bih->biCompression = mmioFOURCC('F', 'F', 'V', '1'); else mux_v->bih->biCompression = mmioFOURCC(lavc_param_vcodec[0], lavc_param_vcodec[1], lavc_param_vcodec[2], lavc_param_vcodec[3]); /* FIXME!!! */