X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmux.c;h=1c08c74b90b350e02e346bb5b2719204ba957289;hb=30f7021aa0be2c978aefb73894b643c9bafbf51c;hp=a05b55b53ccf610b680f1f52d37bb779e4e0b5b1;hpb=56450a0ee4fdda160f4039fc2ae33edfd27765c9;p=ffmpeg diff --git a/libavformat/mux.c b/libavformat/mux.c index a05b55b53cc..1c08c74b90b 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -175,11 +175,6 @@ int avformat_alloc_output_context2(AVFormatContext **avctx, const AVOutputFormat s->priv_data = NULL; if (filename) { -#if FF_API_FORMAT_FILENAME -FF_DISABLE_DEPRECATION_WARNINGS - av_strlcpy(s->filename, filename, sizeof(s->filename)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (!(s->url = av_strdup(filename))) goto nomem; @@ -247,13 +242,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) (ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0) goto fail; -#if FF_API_FORMAT_FILENAME -FF_DISABLE_DEPRECATION_WARNINGS - if (!s->url && !(s->url = av_strdup(s->filename))) { -FF_ENABLE_DEPRECATION_WARNINGS -#else if (!s->url && !(s->url = av_strdup(""))) { -#endif ret = AVERROR(ENOMEM); goto fail; }