[FFmpeg-devel] [PATCH 37/87] avformat: Remove deprecated filename field from AVFormatContext

[James Almer]

From: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

Deprecated in fa8308d3d4f27d6fb38ac2069887a7b259f1c6ab.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
 libavformat/avformat.h | 13 -------------
 libavformat/mux.c      | 11 -----------
 libavformat/utils.c    | 10 ----------
 libavformat/version.h  |  3 ---
 4 files changed, 37 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index d629eaae5d..d0cc12f931 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1255,19 +1255,6 @@ typedef struct AVFormatContext {
      */
     AVStream **streams;
 
-#if FF_API_FORMAT_FILENAME
-    /**
-     * input or output filename
-     *
-     * - demuxing: set by avformat_open_input()
-     * - muxing: may be set by the caller before avformat_write_header()
-     *
-     * @deprecated Use url instead.
-     */
-    attribute_deprecated
-    char filename[1024];
-#endif
-
     /**
      * input or output URL. Unlike the old filename field, this field has no
      * length restriction.
diff --git a/libavformat/mux.c b/libavformat/mux.c
index a05b55b53c..1c08c74b90 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;
     }
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3643a83632..d8b44ce896 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -547,11 +547,6 @@ int avformat_open_input(AVFormatContext **ps, const char *filename,
         goto fail;
     }
 
-#if FF_API_FORMAT_FILENAME
-FF_DISABLE_DEPRECATION_WARNINGS
-    av_strlcpy(s->filename, filename ? filename : "", sizeof(s->filename));
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
     if ((ret = init_input(s, filename, &tmp)) < 0)
         goto fail;
     s->probe_score = ret;
@@ -5800,9 +5795,4 @@ void ff_format_set_url(AVFormatContext *s, char *url)
     av_assert0(url);
     av_freep(&s->url);
     s->url = url;
-#if FF_API_FORMAT_FILENAME
-FF_DISABLE_DEPRECATION_WARNINGS
-    av_strlcpy(s->filename, url, sizeof(s->filename));
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
 }
diff --git a/libavformat/version.h b/libavformat/version.h
index 67dbff5c56..e0cf9e6f3e 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -76,9 +76,6 @@
 #ifndef FF_API_OLD_AVIO_EOF_0
 #define FF_API_OLD_AVIO_EOF_0           (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_FORMAT_FILENAME
-#define FF_API_FORMAT_FILENAME          (LIBAVFORMAT_VERSION_MAJOR < 59)
-#endif
 #ifndef FF_API_OLD_RTSP_OPTIONS
 #define FF_API_OLD_RTSP_OPTIONS         (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-- 
2.31.1