diff options
| author | rguyom <rguyom@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-04 20:45:05 +0000 |
|---|---|---|
| committer | rguyom <rguyom@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-04 20:45:05 +0000 |
| commit | f1aea7a0feaf22f565520c1f1f28a634ae31aaf8 (patch) | |
| tree | 85fdb5e80d1c95b847cb1f061ea6b2847c0873fe /libmpcodecs/ve_xvid.c | |
| parent | 1b23389cbdf632420bafbd6039274ce8a98cdd8a (diff) | |
| download | mpv-f1aea7a0feaf22f565520c1f1f28a634ae31aaf8.tar.bz2 mpv-f1aea7a0feaf22f565520c1f1f28a634ae31aaf8.tar.xz | |
100l.
Noticed by Andreas Hess <jaska at gmx dot net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9836 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ve_xvid.c')
| -rw-r--r-- | libmpcodecs/ve_xvid.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libmpcodecs/ve_xvid.c b/libmpcodecs/ve_xvid.c index 1c68a6f56d..b10eeb68f1 100644 --- a/libmpcodecs/ve_xvid.c +++ b/libmpcodecs/ve_xvid.c @@ -239,9 +239,9 @@ config(struct vf_instance_s* vf, fp->nb_frames = 0; xvid_error[0] = xvid_error[1] = xvid_error[2] = 0; } -#endif if (xvidenc_greyscale) enc_param.global |= XVID_GREYSCALE; +#endif enc_param.rc_reaction_delay_factor = xvidenc_rc_reaction_delay_factor; enc_param.rc_averaging_period = xvidenc_rc_averaging_period; enc_param.rc_buffer = xvidenc_rc_buffer; @@ -269,11 +269,11 @@ config(struct vf_instance_s* vf, fp->enc_frame.general = XVID_HALFPEL | (xvidenc_mpeg_quant ? XVID_MPEGQUANT : XVID_H263QUANT); if (xvidenc_4mv) fp->enc_frame.general |= XVID_INTER4V; - if (xvidenc_lumi_mask) - fp->enc_frame.general |= XVID_LUMIMASKING; if (xvidenc_interlacing) fp->enc_frame.general |= XVID_INTERLACING; #ifdef XVID_API_UNSTABLE + if (xvidenc_lumi_mask) + fp->enc_frame.general |= XVID_LUMIMASKING; if (xvidenc_qpel) { fp->enc_frame.general |= XVID_QUARTERPEL; fp->enc_frame.motion |= PMV_QUARTERPELREFINE16 | PMV_QUARTERPELREFINE8; @@ -303,6 +303,9 @@ config(struct vf_instance_s* vf, fp->enc_frame.general |= XVID_HQACPRED; if (xvidenc_chroma_opt) fp->enc_frame.general |= XVID_CHROMAOPT; +#else + if (xvidenc_greyscale) + fp->enc_frame.general |= XVID_GREYSCALE; #endif switch (outfmt) { |