Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Nov 2011 19:51:39 +0000 (20:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Nov 2011 19:51:49 +0000 (20:51 +0100)
commit8cd210700b831f014d527fcb39a4623b8fa926fd
tree0ba588b7e09429ab356ba5915ca6ebb87fddf3d7
parent82a1d575757d5bc9b0b218fe89c77f8de06a7d39
parentd8407ee2b1e9f62763a2f47d55f80f7993718c99
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: limit lowres to the maximum supported. Fixes Ticket591

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