diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 22:03:20 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 22:03:20 +0300 |
| commit | 0b6f092ed31b83e01e980b596ef8bdd9db6cfff6 (patch) | |
| tree | 844a58a9d243b289647cb6693b9102bff7b4f6ec /libavcodec/mpegvideo_enc.c | |
| parent | 59b009411fcc8531d661a381bbd2608e36c20bd0 (diff) | |
| parent | 4b6b1082a73907c7c3de2646c6398bc61320f2c6 (diff) | |
Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'
* commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6':
lavc: Deprecate avctx.me_method
Conflicts:
doc/encoders.texi
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/motion_est.c
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5e9d6e8d51..b8510ed087 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -370,7 +370,11 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) s->intra_only = 0; } +#if FF_API_MOTION_EST +FF_DISABLE_DEPRECATION_WARNINGS s->me_method = avctx->me_method; +FF_ENABLE_DEPRECATION_WARNINGS +#endif /* Fixed QSCALE */ s->fixed_qscale = !!(avctx->flags & CODEC_FLAG_QSCALE); |