Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
fa8308d3
Commit
fa8308d3
authored
Dec 29, 2017
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: deprecate AVFormatContext filename field
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
18ac6423
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
0 deletions
+30
-0
APIchanges
doc/APIchanges
+4
-0
avformat.h
libavformat/avformat.h
+5
-0
mux.c
libavformat/mux.c
+10
-0
utils.c
libavformat/utils.c
+8
-0
version.h
libavformat/version.h
+3
-0
No files found.
doc/APIchanges
View file @
fa8308d3
...
...
@@ -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.
...
...
libavformat/avformat.h
View file @
fa8308d3
...
...
@@ -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
...
...
libavformat/mux.c
View file @
fa8308d3
...
...
@@ -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
;
}
...
...
libavformat/utils.c
View file @
fa8308d3
...
...
@@ -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
}
libavformat/version.h
View file @
fa8308d3
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment