1
mirror of https://github.com/mpv-player/mpv synced 2025-01-16 22:37:28 +01:00

Support libavcodec vrc_strategy=1 (XviD ratecontrol).

As a side effect, this also makes -lavcopts vcodec=xvid work.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17887 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
corey 2006-03-17 23:47:10 +00:00
parent c0e553be1e
commit fac2fee9fe
3 changed files with 18 additions and 2 deletions

View File

@ -7088,7 +7088,18 @@ currently useless
.
.TP
.B vrc_strategy
Dummy, reserved for future use.
Ratecontrol method.
Note that some of the ratecontrol-affecting options will have no effect
if vrc_strategy is not set to 0.
.PD 0
.RSs
.IPs 0
Use internal lavc ratecontrol (default).
.IPs 1
Use XviD ratecontrol (experimental; requires MEncoder to be compiled
with XviD support).
.RE
.PD 1
.
.TP
.B vb_qfactor=<-31.0\-31.0>

5
configure vendored
View File

@ -6348,6 +6348,7 @@ cat > $TMPC << EOF
int main(void) { xvid_init(0, 0, 0, 0); return 0; }
EOF
_ld_xvid="$_ld_xvid -lxvidcore"
_xvid4=no
if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then
_xvid=yes
_def_xvid3='#define HAVE_XVID3 1'
@ -6360,8 +6361,10 @@ int main(void) { xvid_global(0, 0, 0, 0); return 0; }
EOF
if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then
_xvid=yes
_xvid4=yes
_def_xvid3='#undef HAVE_XVID3'
_def_xvid4='#define HAVE_XVID4 1'
_def_lavc_xvid='#define CONFIG_XVID 1'
_codecmodules="xvid $_codecmodules"
else
_xvid=no
@ -7384,6 +7387,7 @@ AMR_NB_FIXED=$_amr_nb_fixed
AMR_WB=$_amr_wb
`echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
CONFIG_FAAC=$_faac
CONFIG_XVID=$_xvid4
CONFIG_GPL=yes
CONFIG_MUXERS=yes
@ -7750,6 +7754,7 @@ $_def_amr_wb
/* Use specific codecs from libavcodec */
`echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'`
$_def_lavc_faac
$_def_lavc_xvid
/* Use codec libs included in mplayer CVS / source dist: */
$_def_mp3lib

View File

@ -74,7 +74,7 @@ static float lavc_param_vi_qoffset = 0.0;
static int lavc_param_vmax_b_frames = 0;
static int lavc_param_keyint = -1;
static int lavc_param_vpass = 0;
static int lavc_param_vrc_strategy = 2;
static int lavc_param_vrc_strategy = 0;
static int lavc_param_vb_strategy = 0;
static int lavc_param_luma_elim_threshold = 0;
static int lavc_param_chroma_elim_threshold = 0;