X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Foptions.c;h=765bcb7730f7a9333bab9b5e02b8c8caf578069b;hb=a2ca8ed903b435446031a8a0792ca535e6ee2913;hp=00921fbec385659f28c1225358bb90daf0263909;hpb=d59641abfd25a1007bdf4723d952887b1e3619c6;p=ffmpeg diff --git a/libavcodec/options.c b/libavcodec/options.c index 00921fbec38..765bcb7730f 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