Mercurial > mplayer.hg
changeset 14766:35001ce5b853
switch from DIVX -> FMP4 fourcc for libavcodec
| author | michael |
|---|---|
| date | Tue, 22 Feb 2005 20:24:18 +0000 |
| parents | 106106dac710 |
| children | cac458e0c3a4 |
| files | etc/codecs.conf libmpcodecs/ve_lavc.c libmpdemux/aviheader.c |
| diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/codecs.conf Tue Feb 22 20:24:15 2005 +0000 +++ b/etc/codecs.conf Tue Feb 22 20:24:18 2005 +0000 @@ -459,6 +459,7 @@ videocodec ffodivx info "FFmpeg MPEG-4" status working + fourcc FMP4,fmp4 fourcc DIVX,divx fourcc DIV1,div1 divx fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
--- a/libmpcodecs/ve_lavc.c Tue Feb 22 20:24:15 2005 +0000 +++ b/libmpcodecs/ve_lavc.c Tue Feb 22 20:24:18 2005 +0000 @@ -990,7 +990,7 @@ else if (!strcasecmp(lavc_param_vcodec, "ljpeg")) mux_v->bih->biCompression = mmioFOURCC('L', 'J', 'P', 'G'); 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")) mux_v->bih->biCompression = mmioFOURCC('d', 'i', 'v', '3'); else if (!strcasecmp(lavc_param_vcodec, "msmpeg4v2"))
--- a/libmpdemux/aviheader.c Tue Feb 22 20:24:15 2005 +0000 +++ b/libmpdemux/aviheader.c Tue Feb 22 20:24:18 2005 +0000 @@ -289,6 +289,8 @@ case mmioFOURCC('D', 'X', '5', '0'): 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 mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for MPEG4 video\n"); break;