har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat: Remove deprecated filename field from AVFormatContext

Browse Source 
Deprecated in fa8308d3d4f27d6fb38ac2069887a7b259f1c6ab.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-02-26 11:33:09 +01:00 committed by James Almer
parent 704017d91e
commit 30f7021aa0
4 changed files with 0 additions and 37 deletions

13
libavformat/avformat.h

@ -1255,19 +1255,6 @@ typedef struct AVFormatContext {
*/ */
AVStream **streams; 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 * input or output URL. Unlike the old filename field, this field has no
* length restriction. * length restriction.

11
libavformat/mux.c

@ -175,11 +175,6 @@ int avformat_alloc_output_context2(AVFormatContext **avctx, const AVOutputFormat
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));
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (!(s->url = av_strdup(filename))) if (!(s->url = av_strdup(filename)))
goto nomem; 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) (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))) {
FF_ENABLE_DEPRECATION_WARNINGS
#else
if (!s->url && !(s->url = av_strdup(""))) { if (!s->url && !(s->url = av_strdup(""))) {
#endif
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }

10
libavformat/utils.c

@ -547,11 +547,6 @@ 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));
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;
@ -5800,9 +5795,4 @@ 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));
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }

3
libavformat/version.h

@ -76,9 +76,6 @@
#ifndef FF_API_OLD_AVIO_EOF_0 #ifndef FF_API_OLD_AVIO_EOF_0
#define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59) #define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif #endif
#ifndef FF_API_FORMAT_FILENAME
#define FF_API_FORMAT_FILENAME (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_OLD_RTSP_OPTIONS #ifndef FF_API_OLD_RTSP_OPTIONS
#define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59) #define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif #endif