Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Jan 2012 23:27:56 +0000 (00:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Jan 2012 23:28:15 +0000 (00:28 +0100)
commit4805a33043e9356fc344aa53c7df747d41ce6b37
treefc8b2c78b87d1bb616c3b420223cb6c47d5e02b8
parentceb0dd9f1e76a2a2c903fa942e47e8164e0dbedf
parent73f2cf4ed9d61d1fcd06d260a5d3f22131d2fb07
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: Exit on ctrl-c.

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