From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 19 Dec 2011 23:14:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'cus/stable'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c8a441efe24ceb0446a09e82d648a5f4e76d264d;p=ffmpeg

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: remove global video state

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

c8a441efe24ceb0446a09e82d648a5f4e76d264d