diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-05 18:56:56 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-05 18:57:09 +0100 |
commit | 971701d4fc01ff756c41f3fd451fe776e7ec94f4 (patch) | |
tree | 70801ab8c08d0406a86d4633c6de3cf797ed4299 | |
parent | 42b5a6f634d09ba007eeac3f5c898c52f32049c4 (diff) | |
parent | 304ec08f3b3b4c256b44da3e5dc56219eff62a5d (diff) | |
download | ffmpeg-971701d4fc01ff756c41f3fd451fe776e7ec94f4.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: Avoid useage of deprecated url_fileno().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | ffplay.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2546,7 +2546,7 @@ static int read_thread(void *arg) #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")))) { + (ic->pb && !strncmp(input_filename, "mmsh:", 5)))) { /* wait 10 ms to avoid trying to get another packet */ /* XXX: horrible */ SDL_Delay(10); |