diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 15:50:46 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 15:50:46 -0300 |
| commit | 400ecd8e4059e0d6c587915bca5e7e11858cca33 (patch) | |
| tree | 7155baeba3628fedf437a527c7faed947585e3da /libavcodec/mpegvideo_enc.c | |
| parent | 7bbe33b0526723f0a20c27e3b8d03b186b27fdf6 (diff) | |
| parent | 72dc7ddd18fe54ee68aec71590c3202ad009a8fc (diff) | |
Merge commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc'
* commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc':
lavc: Drop deprecated error rate option
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5765ef339f..68e1996687 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1069,13 +1069,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return ret; } -#if FF_API_ERROR_RATE - FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->error_rate) - s->error_rate = avctx->error_rate; - FF_ENABLE_DEPRECATION_WARNINGS; -#endif - #if FF_API_NORMALIZE_AQP FF_DISABLE_DEPRECATION_WARNINGS if (avctx->flags & CODEC_FLAG_NORMALIZE_AQP) |