]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b08a742 708df4a)
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)
* cus/stable:
  ffplay: remove global video state

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.