aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Axelsson <gecko@acc.umu.se>2007-11-06 16:28:32 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2007-11-06 16:28:32 +0000
commitc03af894eb4baa4ebc0b6d17899d510dab0ec84b (patch)
treed1bcfa98333e510124edcb92b0e2cc55eeee1906
parent49ce700a2782784af431e1b1734d53fb551fe5c9 (diff)
downloadffmpeg-c03af894eb4baa4ebc0b6d17899d510dab0ec84b.tar.gz
ffplay currently needs special handling for pausing in some protocols.
Patch by Björn Axelsson: bjorn ; axelsson § intinor : se Original thread: [FFmpeg-devel] [PATCH] MMSH pause support for ffplay Date: 11/02/2007 11:47 AM Originally committed as revision 10936 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffplay.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ffplay.c b/ffplay.c
index 2804cf6872..43a1905e72 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1977,8 +1977,10 @@ static int decode_thread(void *arg)
else
av_read_play(ic);
}
-#ifdef CONFIG_RTSP_DEMUXER
- if (is->paused && !strcmp(ic->iformat->name, "rtsp")) {
+#if defined(CONFIG_RTSP_DEMUXER) || defined(CONFIG_MMSH_PROTOCOL)
+ if (is->paused &&
+ (!strcmp(ic->iformat->name, "rtsp") ||
+ !strcmp(url_fileno(&ic->pb)->prot->name, "mmsh"))) {
/* wait 10 ms to avoid trying to get another packet */
/* XXX: horrible */
SDL_Delay(10);