diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-31 04:52:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-31 04:52:15 +0200 |
| commit | ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (patch) | |
| tree | a5f3a6d636e96f05bb52f0b2407107a7f0c8b443 /libmpcodecs/ve_lavc.c | |
| parent | 03aa64687fc109c5f2346a3c191b70698b333509 (diff) | |
| parent | 0e77da241da8b911c96a0e22898e84d7f7b74678 (diff) | |
| download | mpv-ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3.tar.bz2 mpv-ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3.tar.xz | |
Merge svn changes up to r28403
Diffstat (limited to 'libmpcodecs/ve_lavc.c')
| -rw-r--r-- | libmpcodecs/ve_lavc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 653ae37750..8ab4cc43d3 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -246,8 +246,8 @@ m_option_t lavcopts_conf[]={ {"preme", &lavc_param_pre_me, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, {"subq", &lavc_param_me_subpel_quality, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL}, {"me_range", &lavc_param_me_range, CONF_TYPE_INT, CONF_RANGE, 0, 16000, NULL}, -#ifdef CODEC_FLAG_H263P_AIC - {"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC, NULL}, +#ifdef CODEC_FLAG_AC_PRED + {"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED, NULL}, {"umv", &lavc_param_umv, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV, NULL}, #endif #ifdef CODEC_FLAG_H263P_AIV |