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)
commitc3f20cef06101adabffab98d81c6002d9202ef63
treedee2b0e15e95e43860799291e236c182e44c3bbc
parent75a4b91f8354fbae24a38b94b26ddac6a114014e
parent55594447d635a89d6b0183299f2bf8e27e8a0d42
Merge remote-tracking branch 'cus/stable'

* 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>
ffplay.c