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/ve_divx4.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/ve_divx4.c')
| -rw-r--r-- | libmpcodecs/ve_divx4.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpcodecs/ve_divx4.c b/libmpcodecs/ve_divx4.c index aeb9198667..bd76d74432 100644 --- a/libmpcodecs/ve_divx4.c +++ b/libmpcodecs/ve_divx4.c @@ -45,7 +45,11 @@ static int pass; extern char* passtmpfile; +#ifdef ENCORE_XVID +#include <divx4.h> +#else #include <encore2.h> +#endif #ifndef ENCORE_MAJOR_VERSION #define ENCORE_MAJOR_VERSION 4000 |