Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: Avoid useage of deprecated url_fileno().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-05 18:56:56 +01:00
commit 971701d4fc

View File

@ -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);