diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-06 20:24:14 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-06 20:24:14 +0000 |
| commit | 705681b0dbd9ec3158849dcb5695f386fdeb119d (patch) | |
| tree | d2df452cfd67d22f769bf013bc3aa645a657e4c5 /libmpcodecs/vd_xvid.c | |
| parent | af78689681a7d664b5e1ddb2e3c4ac5da5cb19f1 (diff) | |
| download | mpv-705681b0dbd9ec3158849dcb5695f386fdeb119d.tar.bz2 mpv-705681b0dbd9ec3158849dcb5695f386fdeb119d.tar.xz | |
cleanup detection of various divx4 versions/alternatives
allows mixing xvid with divx4/5linux libs
basic rule: -vfm odivx/divx4 and -ovc divx4 uses divx4/5linux/opendivx if
available, otherwise uses xvid (if divx4.h is available and xvid has
decore()/encore() functions).
based on patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9301 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_xvid.c')
| -rw-r--r-- | libmpcodecs/vd_xvid.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libmpcodecs/vd_xvid.c b/libmpcodecs/vd_xvid.c index 5d9080d1e7..289c45cb55 100644 --- a/libmpcodecs/vd_xvid.c +++ b/libmpcodecs/vd_xvid.c @@ -9,9 +9,17 @@ #include "vd_internal.h" #include "cfgparser.h" -#include <divx4.h> #include <xvid.h> +typedef struct +{ + void *y; + void *u; + void *v; + int stride_y; + int stride_uv; +} +DIVX4_DEC_PICTURE; #ifdef XVID_API_UNSTABLE #warning ******************************************************************* @@ -178,7 +186,7 @@ static void uninit(sh_video_t *sh){ // decode a frame static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ XVID_DEC_FRAME dec; - DEC_PICTURE d4_pic; + DIVX4_DEC_PICTURE d4_pic; #ifdef XVID_CSP_EXTERN XVID_DEC_PICTURE pic; #endif |