aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-12-19 20:57:13 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-12-19 20:57:13 +0000
commit502bdf68937d71006d55aebd9da98e750bce4010 (patch)
treea0d144e92dac0b6f9b18593eaa31a544564130a3 /libavformat/utils.c
parent79e42311d3b8a7e8efb85866c1cec120da6d0983 (diff)
downloadffmpeg-502bdf68937d71006d55aebd9da98e750bce4010.tar.gz
Merge recently added and still unused play and pause functions.
Originally committed as revision 11273 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index f4cf10f14d..e5e04bf745 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2042,8 +2042,8 @@ int av_read_play(AVFormatContext *s)
{
if (s->iformat->read_play)
return s->iformat->read_play(s);
- if (s->pb && s->pb->read_play)
- return av_url_read_fplay(s->pb);
+ if (s->pb && s->pb->read_pause)
+ return av_url_read_fpause(s->pb, 0);
return AVERROR(ENOSYS);
}
@@ -2052,7 +2052,7 @@ int av_read_pause(AVFormatContext *s)
if (s->iformat->read_pause)
return s->iformat->read_pause(s);
if (s->pb && s->pb->read_pause)
- return av_url_read_fpause(s->pb);
+ return av_url_read_fpause(s->pb, 1);
return AVERROR(ENOSYS);
}