[FFmpeg-cvslog] avformat/utils: Move av_read_(play|pause) to demux_utils.c
Andreas Rheinhardt
git at videolan.org
Tue May 10 09:35:32 EEST 2022
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri May 6 21:06:03 2022 +0200| [0b0dfb765da6cf796d3798e808da741cc697c4fa] | committer: Andreas Rheinhardt
avformat/utils: Move av_read_(play|pause) to demux_utils.c
These functions are for demuxers only.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b0dfb765da6cf796d3798e808da741cc697c4fa
---
libavformat/demux_utils.c | 18 ++++++++++++++++++
libavformat/utils.c | 18 ------------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/libavformat/demux_utils.c b/libavformat/demux_utils.c
index ffcadc1900..4d9ba9a028 100644
--- a/libavformat/demux_utils.c
+++ b/libavformat/demux_utils.c
@@ -197,3 +197,21 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
return 0;
}
+
+int av_read_play(AVFormatContext *s)
+{
+ if (s->iformat->read_play)
+ return s->iformat->read_play(s);
+ if (s->pb)
+ return avio_pause(s->pb, 0);
+ return AVERROR(ENOSYS);
+}
+
+int av_read_pause(AVFormatContext *s)
+{
+ if (s->iformat->read_pause)
+ return s->iformat->read_pause(s);
+ if (s->pb)
+ return avio_pause(s->pb, 1);
+ return AVERROR(ENOSYS);
+}
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5249607745..50e8298241 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -458,24 +458,6 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type,
/*******************************************************/
-int av_read_play(AVFormatContext *s)
-{
- if (s->iformat->read_play)
- return s->iformat->read_play(s);
- if (s->pb)
- return avio_pause(s->pb, 0);
- return AVERROR(ENOSYS);
-}
-
-int av_read_pause(AVFormatContext *s)
-{
- if (s->iformat->read_pause)
- return s->iformat->read_pause(s);
- if (s->pb)
- return avio_pause(s->pb, 1);
- return AVERROR(ENOSYS);
-}
-
int ff_stream_side_data_copy(AVStream *dst, const AVStream *src)
{
/* Free existing side data*/
More information about the ffmpeg-cvslog
mailing list