diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-31 21:04:39 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-31 21:04:39 +0400 |
commit | df98446ba3b4a7775d5b79d9115dd837f309d991 (patch) | |
tree | f99580d0c65e244577d5268edc68f7e7809b6cfa /ffplay.c | |
parent | d2ea38ddb761e0fd5d04a53118222bbcd476568e (diff) |
Revert "Remove detection of mmsh protocol in ffplay."
This reverts commit 2f642393381659f4a198d9c5a96896eebb23de18.
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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); |