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@outlook.com>
release/5.1
Andreas Rheinhardt 3 years ago
parent ff0e8e14c3
commit d2da1dc443
  1. 10
      libavformat/demux_utils.c
  2. 10
      libavformat/utils.c

@ -73,3 +73,13 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_ba
return chapter; 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;
}
}

@ -63,16 +63,6 @@ int ff_unlock_avformat(void)
return ff_mutex_unlock(&avformat_mutex) ? -1 : 0; 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) int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src)
{ {
av_assert0(!dst->codec_whitelist && av_assert0(!dst->codec_whitelist &&

Loading…
Cancel
Save