aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-01-19 21:39:07 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-01-19 21:39:07 +0000
commit2f642393381659f4a198d9c5a96896eebb23de18 (patch)
tree4db8f98b4c8835e9dd6bdf85682d4acf04b711e3 /ffplay.c
parent6f2009bf458b48d664ab9101bdc789965bcf772f (diff)
downloadffmpeg-2f642393381659f4a198d9c5a96896eebb23de18.tar.gz
Remove detection of mmsh protocol in ffplay.
This is useless as long as mmsh is not implemented in libavformat. This is a revert of r10936. Originally committed as revision 16687 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ffplay.c b/ffplay.c
index 88e6b1a143..877c9f6e43 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2019,10 +2019,8 @@ static int decode_thread(void *arg)
else
av_read_play(ic);
}
-#if CONFIG_RTSP_DEMUXER || CONFIG_MMSH_PROTOCOL
- if (is->paused &&
- (!strcmp(ic->iformat->name, "rtsp") ||
- (ic->pb && !strcmp(url_fileno(ic->pb)->prot->name, "mmsh")))) {
+#if CONFIG_RTSP_DEMUXER
+ if (is->paused && !strcmp(ic->iformat->name, "rtsp")) {
/* wait 10 ms to avoid trying to get another packet */
/* XXX: horrible */
SDL_Delay(10);