RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

new lavc codec: ffvhuff 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14058 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
lorenm 2004-11-28 18:37:49 +00:00
parent b37da8c945
commit a063b1bf18
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/codecs.conf
View File

@ -294,7 +294,7 @@ videocodec cvidxa
videocodec ffhuffyuv videocodec ffhuffyuv
info "FFmpeg HuffYUV" info "FFmpeg HuffYUV"
status working status working
fourcc HFYU fourcc HFYU,FFVH
driver ffmpeg driver ffmpeg
dll huffyuv dll huffyuv
out YUY2,422P,YV12 out YUY2,422P,YV12

1
libmpcodecs/vd_ffmpeg.c
View File

@ -314,6 +314,7 @@ static int init(sh_video_t *sh){
(sh->format == mmioFOURCC('M','4','S','2') || (sh->format == mmioFOURCC('M','4','S','2') ||
sh->format == mmioFOURCC('M','P','4','S') || sh->format == mmioFOURCC('M','P','4','S') ||
sh->format == mmioFOURCC('H','F','Y','U') || sh->format == mmioFOURCC('H','F','Y','U') ||
sh->format == mmioFOURCC('F','F','V','H') ||
sh->format == mmioFOURCC('W','M','V','2') || sh->format == mmioFOURCC('W','M','V','2') ||
sh->format == mmioFOURCC('A','S','V','1') || sh->format == mmioFOURCC('A','S','V','1') ||
sh->format == mmioFOURCC('A','S','V','2') || sh->format == mmioFOURCC('A','S','V','2') ||

5
libmpcodecs/ve_lavc.c
View File

@ -932,7 +932,8 @@ static int vf_open(vf_instance_t *vf, char* args){
memset(mux_v->bih, 0, sizeof(BITMAPINFOHEADER)+28); memset(mux_v->bih, 0, sizeof(BITMAPINFOHEADER)+28);
mux_v->bih->biSize=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 ...) */ /* XXX: hack: huffyuv needs to store huffman tables (allthough we dunno the size yet ...) */
mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)+1000); 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'); mux_v->bih->biCompression = mmioFOURCC('W', 'M', 'V', '2');
else if (!strcasecmp(lavc_param_vcodec, "huffyuv")) else if (!strcasecmp(lavc_param_vcodec, "huffyuv"))
mux_v->bih->biCompression = mmioFOURCC('H', 'F', 'Y', 'U'); 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")) else if (!strcasecmp(lavc_param_vcodec, "asv1"))
mux_v->bih->biCompression = mmioFOURCC('A', 'S', 'V', '1'); mux_v->bih->biCompression = mmioFOURCC('A', 'S', 'V', '1');
else if (!strcasecmp(lavc_param_vcodec, "asv2")) else if (!strcasecmp(lavc_param_vcodec, "asv2"))