avformat: deprecate AVFormatContext filename field

Signed-off-by: Marton Balint <cus@passwd.hu>

diff --git a/doc/APIchanges b/doc/APIchanges
index 878429848d050cf1a2274cd4155801154880e4e7..6185545d56c3b0f796b9668ab69396a3edf87065 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,10 @@ libavutil:     2017-10-21
 
 API changes, most recent first:
 
+2018-01-xx - xxxxxxx - lavf 58.7.100 - avformat.h
+  Deprecate AVFormatContext filename field which had limited length, use the
+  new dynamically allocated url field instead.
+
 2018-01-xx - xxxxxxx - lavf 58.7.100 - avformat.h
   Add url field to AVFormatContext and add ff_format_set_url helper function.
 

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index d1bd4902d0a2e16ee8ced7140cb68e164264b347..82f98453375eda58abc510164a5768a3f1f688c8 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1394,13 +1394,18 @@ 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

diff --git a/libavformat/mux.c b/libavformat/mux.c
index de63f2ca25326511bc72abb8c6c03ea17e2720ce..a13f0e3a1b8a7a8ea9e8ac2f18e696546d972289 100644 (file)
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -187,7 +187,11 @@ int avformat_alloc_output_context2(AVFormatContext **avctx, AVOutputFormat *ofor
         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;
 
@@ -255,7 +259,13 @@ 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 0d722c69c82d2a83e5c21f503ccf4387913a6c18..28ea0714091c66264b098f858451de34d17ae446 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -560,7 +560,11 @@ 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;
@@ -5648,5 +5652,9 @@ 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 c375b0da157295ed376807562c0174552d519800..897be0c2fe9e270eb3b67f557e6e1367bfe2be3b 100644 (file)
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -85,6 +85,9 @@
 #ifndef FF_API_LAVF_FFSERVER
 #define FF_API_LAVF_FFSERVER            (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
+#ifndef FF_API_FORMAT_FILENAME
+#define FF_API_FORMAT_FILENAME          (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
 
 
 #ifndef FF_API_R_FRAME_RATE