Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 Dec 2011 23:14:59 +0000 (00:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 Dec 2011 23:15:06 +0000 (00:15 +0100)
commitc8a441efe24ceb0446a09e82d648a5f4e76d264d
tree06b992a2fffa62ddc57c75d7cd775351a8a6fe0c
parentb08a742526d05bcf300af820da5c79d2a05f9959
parent708df4ac66d6b620c216d4d7d48b1da66b8a3b02
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: remove global video state

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