avformat: deprecate AVFormatContext filename field

Signed-off-by: Marton Balint <cus@passwd.hu>
pull/277/head
Marton Balint 7 years ago
parent 18ac642359
commit fa8308d3d4
  1. 4
      doc/APIchanges
  2. 5
      libavformat/avformat.h
  3. 10
      libavformat/mux.c
  4. 8
      libavformat/utils.c
  5. 3
      libavformat/version.h

@ -15,6 +15,10 @@ libavutil: 2017-10-21
API changes, most recent first: 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 2018-01-xx - xxxxxxx - lavf 58.7.100 - avformat.h
Add url field to AVFormatContext and add ff_format_set_url helper function. Add url field to AVFormatContext and add ff_format_set_url helper function.

@ -1394,13 +1394,18 @@ typedef struct AVFormatContext {
*/ */
AVStream **streams; AVStream **streams;
#if FF_API_FORMAT_FILENAME
/** /**
* input or output filename * input or output filename
* *
* - demuxing: set by avformat_open_input() * - demuxing: set by avformat_open_input()
* - muxing: may be set by the caller before avformat_write_header() * - muxing: may be set by the caller before avformat_write_header()
*
* @deprecated Use url instead.
*/ */
attribute_deprecated
char filename[1024]; char filename[1024];
#endif
/** /**
* input or output URL. Unlike the old filename field, this field has no * input or output URL. Unlike the old filename field, this field has no

@ -187,7 +187,11 @@ int avformat_alloc_output_context2(AVFormatContext **avctx, AVOutputFormat *ofor
s->priv_data = NULL; s->priv_data = NULL;
if (filename) { if (filename) {
#if FF_API_FORMAT_FILENAME
FF_DISABLE_DEPRECATION_WARNINGS
av_strlcpy(s->filename, filename, sizeof(s->filename)); av_strlcpy(s->filename, filename, sizeof(s->filename));
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (!(s->url = av_strdup(filename))) if (!(s->url = av_strdup(filename)))
goto nomem; 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) (ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0)
goto fail; goto fail;
#if FF_API_FORMAT_FILENAME
FF_DISABLE_DEPRECATION_WARNINGS
if (!s->url && !(s->url = av_strdup(s->filename))) { 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); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }

@ -560,7 +560,11 @@ int avformat_open_input(AVFormatContext **ps, const char *filename,
goto fail; goto fail;
} }
#if FF_API_FORMAT_FILENAME
FF_DISABLE_DEPRECATION_WARNINGS
av_strlcpy(s->filename, filename ? filename : "", sizeof(s->filename)); av_strlcpy(s->filename, filename ? filename : "", sizeof(s->filename));
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if ((ret = init_input(s, filename, &tmp)) < 0) if ((ret = init_input(s, filename, &tmp)) < 0)
goto fail; goto fail;
s->probe_score = ret; s->probe_score = ret;
@ -5648,5 +5652,9 @@ void ff_format_set_url(AVFormatContext *s, char *url)
av_assert0(url); av_assert0(url);
av_freep(&s->url); av_freep(&s->url);
s->url = url; s->url = url;
#if FF_API_FORMAT_FILENAME
FF_DISABLE_DEPRECATION_WARNINGS
av_strlcpy(s->filename, url, sizeof(s->filename)); av_strlcpy(s->filename, url, sizeof(s->filename));
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }

@ -85,6 +85,9 @@
#ifndef FF_API_LAVF_FFSERVER #ifndef FF_API_LAVF_FFSERVER
#define FF_API_LAVF_FFSERVER (LIBAVFORMAT_VERSION_MAJOR < 59) #define FF_API_LAVF_FFSERVER (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif #endif
#ifndef FF_API_FORMAT_FILENAME
#define FF_API_FORMAT_FILENAME (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_R_FRAME_RATE #ifndef FF_API_R_FRAME_RATE

Loading…
Cancel
Save