diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-11 00:39:40 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-11 00:39:40 +0000 |
| commit | 6955159f7eeeeb0658eb835be9c546bdbc3678cc (patch) | |
| tree | 52e6ace6fa4068e6fcf2eb0189d360fe31055b66 /libmpcodecs/vd_divx4.c | |
| parent | 211cc4d5c4345d474ab5293195bbc2798dd57e1d (diff) | |
| download | mpv-6955159f7eeeeb0658eb835be9c546bdbc3678cc.tar.bz2 mpv-6955159f7eeeeb0658eb835be9c546bdbc3678cc.tar.xz | |
hopefully fixed divx5 header + xvid conflict
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5038 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_divx4.c')
| -rw-r--r-- | libmpcodecs/vd_divx4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/vd_divx4.c b/libmpcodecs/vd_divx4.c index 4ee365c852..603111e4e8 100644 --- a/libmpcodecs/vd_divx4.c +++ b/libmpcodecs/vd_divx4.c @@ -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); |