RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 08:12:17 +00:00
Code Issues Releases Wiki Activity

switch from DIVX -> FMP4 fourcc for libavcodec

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14767 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael 2005-02-22 20:24:18 +00:00
parent d6309637a2
commit 81ef1c7db5
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/codecs.conf
View File

@ -459,6 +459,7 @@ videocodec ffsvq3
videocodec ffodivx videocodec ffodivx
info "FFmpeg MPEG-4" info "FFmpeg MPEG-4"
status working status working
fourcc FMP4,fmp4
fourcc DIVX,divx fourcc DIVX,divx
fourcc DIV1,div1 divx fourcc DIV1,div1 divx
fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 fourcc MP4S,mp4s ; ISO MPEG-4 Video V1

2
libmpcodecs/ve_lavc.c
View File

@ -990,7 +990,7 @@ static int vf_open(vf_instance_t *vf, char* args){
else if (!strcasecmp(lavc_param_vcodec, "ljpeg")) else if (!strcasecmp(lavc_param_vcodec, "ljpeg"))
mux_v->bih->biCompression = mmioFOURCC('L', 'J', 'P', 'G'); mux_v->bih->biCompression = mmioFOURCC('L', 'J', 'P', 'G');
else if (!strcasecmp(lavc_param_vcodec, "mpeg4")) else if (!strcasecmp(lavc_param_vcodec, "mpeg4"))
mux_v->bih->biCompression = mmioFOURCC('D', 'I', 'V', 'X'); mux_v->bih->biCompression = mmioFOURCC('F', 'M', 'P', '4');
else if (!strcasecmp(lavc_param_vcodec, "msmpeg4")) else if (!strcasecmp(lavc_param_vcodec, "msmpeg4"))
mux_v->bih->biCompression = mmioFOURCC('d', 'i', 'v', '3'); mux_v->bih->biCompression = mmioFOURCC('d', 'i', 'v', '3');
else if (!strcasecmp(lavc_param_vcodec, "msmpeg4v2")) else if (!strcasecmp(lavc_param_vcodec, "msmpeg4v2"))

2
libmpdemux/aviheader.c
View File

@ -289,6 +289,8 @@ while(1){
case mmioFOURCC('D', 'X', '5', '0'): case mmioFOURCC('D', 'X', '5', '0'):
case mmioFOURCC('X', 'V', 'I', 'D'): case mmioFOURCC('X', 'V', 'I', 'D'):
case mmioFOURCC('x', 'v', 'i', 'd'): case mmioFOURCC('x', 'v', 'i', 'd'):
case mmioFOURCC('F', 'M', 'P', '4'):
case mmioFOURCC('f', 'm', 'p', '4'):
idxfix_divx=2; // set index recovery mpeg4 flavour: generic mpeg4 idxfix_divx=2; // set index recovery mpeg4 flavour: generic mpeg4
mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for MPEG4 video\n"); mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for MPEG4 video\n");
break; break;