diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-16 16:03:38 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-23 10:09:17 +0100 |
| commit | 94eed68ace9f2416af8457fcbf142b175928c06b (patch) | |
| tree | 6c4c97060df6dcb4128c959bb3b4b281bc85feb7 /libavcodec/options.c | |
| parent | c43a96fe16e6a6ea091e64ca271f0788f4a0bea9 (diff) | |
| download | ffmpeg-94eed68ace9f2416af8457fcbf142b175928c06b.tar.gz | |
lavc: Drop deprecated options moved to private contexts
Deprecated in 10/2014 and 07/2015.
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 00921fbec3..765bcb7730 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -192,16 +192,6 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) dest->rc_override = NULL; dest->subtitle_header = NULL; dest->hw_frames_ctx = NULL; -#if FF_API_MPV_OPT - FF_DISABLE_DEPRECATION_WARNINGS - dest->rc_eq = NULL; - if (src->rc_eq) { - dest->rc_eq = av_strdup(src->rc_eq); - if (!dest->rc_eq) - return AVERROR(ENOMEM); - } - FF_ENABLE_DEPRECATION_WARNINGS -#endif #define alloc_and_copy_or_fail(obj, size, pad) \ if (src->obj && size > 0) { \ @@ -236,11 +226,6 @@ fail: av_freep(&dest->inter_matrix); av_freep(&dest->extradata); av_buffer_unref(&dest->hw_frames_ctx); -#if FF_API_MPV_OPT - FF_DISABLE_DEPRECATION_WARNINGS - av_freep(&dest->rc_eq); - FF_ENABLE_DEPRECATION_WARNINGS -#endif return AVERROR(ENOMEM); } #endif |