summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/demux_utils.c18
-rw-r--r--libavformat/utils.c18
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*/