Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Sep 2012 12:59:03 +0000 (14:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Sep 2012 12:59:08 +0000 (14:59 +0200)
* cus/stable:
  ffplay: only free vfilters on exit
  ffplay: replace SDL_delay in read thread with SDL_CondWait
  ffplay: requeue last picture on forced video refresh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
ffplay.c

diff --cc ffplay.c
Simple merge