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)
* cus/stable:
  ffplay: limit lowres to the maximum supported. Fixes Ticket591

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

diff --cc ffplay.c
Simple merge