diff options
| -rw-r--r-- | etc/codecs.conf | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 1 | ||||
| -rw-r--r-- | libmpcodecs/ve_lavc.c | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 0500b13ab5..2c8ad8a8da 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -294,7 +294,7 @@ videocodec cvidxa videocodec ffhuffyuv info "FFmpeg HuffYUV" status working - fourcc HFYU + fourcc HFYU,FFVH driver ffmpeg dll huffyuv out YUY2,422P,YV12 diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 5c8dcc9d9d..69e9315e05 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -314,6 +314,7 @@ static int init(sh_video_t *sh){ (sh->format == mmioFOURCC('M','4','S','2') || sh->format == mmioFOURCC('M','P','4','S') || sh->format == mmioFOURCC('H','F','Y','U') || + sh->format == mmioFOURCC('F','F','V','H') || sh->format == mmioFOURCC('W','M','V','2') || sh->format == mmioFOURCC('A','S','V','1') || sh->format == mmioFOURCC('A','S','V','2') || diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 69873f7f48..3f12d31b26 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -932,7 +932,8 @@ static int vf_open(vf_instance_t *vf, char* args){ memset(mux_v->bih, 0, sizeof(BITMAPINFOHEADER)+28); mux_v->bih->biSize=sizeof(BITMAPINFOHEADER)+28; } - else if (lavc_param_vcodec && !strcasecmp(lavc_param_vcodec, "huffyuv")) + else if (lavc_param_vcodec && (!strcasecmp(lavc_param_vcodec, "huffyuv") + || !strcasecmp(lavc_param_vcodec, "ffvhuff"))) { /* XXX: hack: huffyuv needs to store huffman tables (allthough we dunno the size yet ...) */ mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)+1000); @@ -997,6 +998,8 @@ static int vf_open(vf_instance_t *vf, char* args){ mux_v->bih->biCompression = mmioFOURCC('W', 'M', 'V', '2'); else if (!strcasecmp(lavc_param_vcodec, "huffyuv")) mux_v->bih->biCompression = mmioFOURCC('H', 'F', 'Y', 'U'); + else if (!strcasecmp(lavc_param_vcodec, "ffvhuff")) + mux_v->bih->biCompression = mmioFOURCC('F', 'F', 'V', 'H'); else if (!strcasecmp(lavc_param_vcodec, "asv1")) mux_v->bih->biCompression = mmioFOURCC('A', 'S', 'V', '1'); else if (!strcasecmp(lavc_param_vcodec, "asv2")) |