diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-08 17:02:32 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-08 17:02:32 +0000 |
| commit | 923f67082e60afc96d9efd2b88f75d992834c8a6 (patch) | |
| tree | 6dffb6b669c79ff11095ac6e23d607db1514cc79 /libmpcodecs/vf_qp.c | |
| parent | b128f3e558af20ac6e7bbfedaf1c47c5860ec53c (diff) | |
| download | mpv-923f67082e60afc96d9efd2b88f75d992834c8a6.tar.bz2 mpv-923f67082e60afc96d9efd2b88f75d992834c8a6.tar.xz | |
Fix compilation after libavcodec major version 52 changes
Some symbols were dropped or renamed, requiring corresponding changes
in MPlayer.
- Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample.
- Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT.
- Don't set AVCodecContext->rtp_mode (already marked unused before).
- Use ff_eval2() instead of ff_eval().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vf_qp.c')
| -rw-r--r-- | libmpcodecs/vf_qp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c index 00c67383e0..d8fcb57d97 100644 --- a/libmpcodecs/vf_qp.c +++ b/libmpcodecs/vf_qp.c @@ -75,7 +75,10 @@ static int config(struct vf_instance_s* vf, NULL }; - vf->priv->lut[i+129]= lrintf(ff_eval(vf->priv->eq, const_values, const_names, NULL, NULL, NULL, NULL, NULL)); + const char *error = NULL; + vf->priv->lut[i+129]= lrintf(ff_eval2(vf->priv->eq, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error)); + if (error) + mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\": %s\n", vf->priv->eq, error); } return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); |