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)
commitf7cba736bada4fcdd776617bf2df0b10ad8a44f8
treed5bdf4ee53d6715deb938f5a4a31e316a0063b7e
parent64b25938e90253432d28ffd7d971f085c560a523
parent58f22f70121c2c9f4bf9935d00c7ba7948fbe5c0
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: only configure video filters after we got the first frame

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