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_odivx.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_odivx.c')
| -rw-r--r-- | libmpcodecs/vd_odivx.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libmpcodecs/vd_odivx.c b/libmpcodecs/vd_odivx.c index 173e36bcff..b9700a476d 100644 --- a/libmpcodecs/vd_odivx.c +++ b/libmpcodecs/vd_odivx.c @@ -13,9 +13,13 @@ static vd_info_t info = { #ifdef NEW_DECORE #ifdef DECORE_DIVX5 - "DivX5Linux lib (odivx mode)", + "DivX5Linux lib (odivx compat.)", #else - "DivX4Linux lib (odivx mode)", +#ifdef DECORE_XVID + "XviD lib (odivx compat.)", +#else + "DivX4Linux lib (odivx compat.)", +#endif #endif #else "Opendivx 0.48 codec", @@ -23,7 +27,11 @@ static vd_info_t info = { "odivx", "A'rpi", #ifdef NEW_DECORE +#ifdef DECORE_XVID + "http://www.xvid.com", +#else "http://www.divx.com", +#endif #else "http://www.projectmayo.org", #endif @@ -39,7 +47,7 @@ LIBVD_EXTERN(odivx) #ifndef NEW_DECORE #include "opendivx/decore.h" #include "postproc/postprocess.h" -#elif HAVE_DIVX4_H +#elif DECORE_XVID #include <divx4.h> #else #include <decore.h> |