Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Sep 2012 21:33:25 +0000 (23:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Sep 2012 21:33:34 +0000 (23:33 +0200)
commit507c0416cd392802530de8f2c3b362f667c7fbdc
tree03c754ebe531f18f8ada74365d1d8f0ff5177629
parent578bbf8149fcb0ae98055e67e6ab92f23384e6fe
parentcdea19e75a1854748a55e5a1a09b53cc4bf789c5
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: increase sample array buffer
  configure: add crop filter as ffplay requirement
  ffplay: ensure that pictq_prev_picture never fills the picture queue
  ffplay: simplify picture allocation
  ffplay: make initial window size calculation based on aspect ratio
  ffplay: factor display rectangle calculation to its own function

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