Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: dont wait 100ms if data is not yet ready

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/28/head
Michael Niedermayer 12 years ago
commit 83438a0db3
  1. 4
      ffplay.c

@ -2586,7 +2586,9 @@ static int read_thread(void *arg)
eof = 1; eof = 1;
if (ic->pb && ic->pb->error) if (ic->pb && ic->pb->error)
break; break;
SDL_Delay(100); /* wait for user event */ SDL_LockMutex(wait_mutex);
SDL_CondWaitTimeout(is->continue_read_thread, wait_mutex, 10);
SDL_UnlockMutex(wait_mutex);
continue; continue;
} }
/* check if packet is in play range specified by user, then queue, otherwise discard */ /* check if packet is in play range specified by user, then queue, otherwise discard */

Loading…
Cancel
Save