]> git.sesse.net Git - ffmpeg/commitdiff
Revert "Remove detection of mmsh protocol in ffplay."
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 31 Oct 2011 17:04:39 +0000 (18:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 31 Oct 2011 17:04:39 +0000 (18:04 +0100)
This reverts commit 2f642393381659f4a198d9c5a96896eebb23de18.

ffplay.c

index 5a32d4e5dcbd4a71ff8c4dd04f9ddce6217026db..ae9db33ffe399741813ee201b52153aa157e5fd9 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -2543,8 +2543,10 @@ static int read_thread(void *arg)
             else
                 av_read_play(ic);
         }
-#if CONFIG_RTSP_DEMUXER
-        if (is->paused && !strcmp(ic->iformat->name, "rtsp")) {
+#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")))) {
             /* wait 10 ms to avoid trying to get another packet */
             /* XXX: horrible */
             SDL_Delay(10);