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

hopefully fixed divx5 header + xvid conflict 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5038 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-03-11 00:39:40 +00:00
parent 211cc4d5c4
commit 6955159f7e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpcodecs/vd_divx4.c
View File

@ -132,7 +132,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
dec_frame.bmp=mpi->planes[0];
dec_frame.stride=mpi->width;
#ifdef DECORE_DIVX5
#ifndef DEC_OPT_FRAME_311
decore(0x123, DEC_OPT_FRAME, &dec_frame, NULL);
#else
decore(0x123, (sh->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);

2
libmpcodecs/vd_odivx.c
View File

@ -146,7 +146,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
#ifdef NEW_DECORE
dec_frame.bmp=&dec_pic;
dec_pic.y=dec_pic.u=dec_pic.v=NULL;
#ifdef DECORE_DIVX5
#ifndef DEC_OPT_FRAME_311
decore(0x123, DEC_OPT_FRAME, &dec_frame, NULL);
#else
decore(0x123, (sh->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);