Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jul 2012 00:44:22 +0000 (02:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jul 2012 00:44:28 +0000 (02:44 +0200)
* cus/stable:
  ffplay: only configure video filters after we got the first frame

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

diff --cc ffplay.c
Simple merge