[FFmpeg-cvslog] avformat/utils: Move av_format_inject_global_side_data to demux_utils.c
Andreas Rheinhardt
git at videolan.org
Tue May 10 09:35:24 EEST 2022
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri May 6 20:33:40 2022 +0200| [d2da1dc4433367226024fa3ae2c747e55353f620] | committer: Andreas Rheinhardt
avformat/utils: Move av_format_inject_global_side_data to demux_utils.c
This function is only intended for demuxers (as calling it doesn't
have any observable effect for a muxer).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2da1dc4433367226024fa3ae2c747e55353f620
---
libavformat/demux_utils.c | 10 ++++++++++
libavformat/utils.c | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavformat/demux_utils.c b/libavformat/demux_utils.c
index cfd6084d54..0ec9f3b2fa 100644
--- a/libavformat/demux_utils.c
+++ b/libavformat/demux_utils.c
@@ -73,3 +73,13 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_ba
return chapter;
}
+
+void av_format_inject_global_side_data(AVFormatContext *s)
+{
+ FFFormatContext *const si = ffformatcontext(s);
+ si->inject_global_side_data = 1;
+ for (unsigned i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+ ffstream(st)->inject_global_side_data = 1;
+ }
+}
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1235315986..b20dad2458 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -63,16 +63,6 @@ int ff_unlock_avformat(void)
return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
}
-void av_format_inject_global_side_data(AVFormatContext *s)
-{
- FFFormatContext *const si = ffformatcontext(s);
- si->inject_global_side_data = 1;
- for (unsigned i = 0; i < s->nb_streams; i++) {
- AVStream *st = s->streams[i];
- ffstream(st)->inject_global_side_data = 1;
- }
-}
-
int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src)
{
av_assert0(!dst->codec_whitelist &&
More information about the ffmpeg-cvslog
mailing list