[FFmpeg-cvslog] Revert "Remove detection of mmsh protocol in ffplay."

Michael Niedermayer git at videolan.org
Mon Oct 31 20:57:28 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 31 18:04:39 2011 +0100| [df98446ba3b4a7775d5b79d9115dd837f309d991] | committer: Michael Niedermayer

Revert "Remove detection of mmsh protocol in ffplay."

This reverts commit 2f642393381659f4a198d9c5a96896eebb23de18.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df98446ba3b4a7775d5b79d9115dd837f309d991
---

 ffplay.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 5a32d4e..ae9db33 100644
--- 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);



More information about the ffmpeg-cvslog mailing list