From: Michael Niedermayer Date: Mon, 31 Oct 2011 17:04:39 +0000 (+0100) Subject: Revert "Remove detection of mmsh protocol in ffplay." X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=df98446ba3b4a7775d5b79d9115dd837f309d991;p=ffmpeg Revert "Remove detection of mmsh protocol in ffplay." This reverts commit 2f642393381659f4a198d9c5a96896eebb23de18. --- diff --git a/ffplay.c b/ffplay.c index 5a32d4e5dcb..ae9db33ffe3 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);