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 /cfg-mencoder.h | |
| 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 'cfg-mencoder.h')
| -rw-r--r-- | cfg-mencoder.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index f22027388f..2badf36ace 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -73,7 +73,11 @@ struct config ovc_conf[]={ " frameno - special audio-only file for 3-pass encoding, see DOCS!\n" " rawrgb - uncompressed RGB 24bpp video\n" #ifdef HAVE_DIVX4ENCORE - " divx4 - using divx4linux/divx5linux or xvid (depends on configuration)\n" +#ifdef ENCORE_XVID + " divx4 - using XviD (divx4linux compat. mode)\n" +#else + " divx4 - using divx4linux/divx5linux lib (depends on configuration)\n" +#endif #endif #ifdef USE_LIBAVCODEC " lavc - using libavcodec codecs - best quality!\n" |