Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Sep 2014 01:23:16 +0000 (03:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Sep 2014 01:23:19 +0000 (03:23 +0200)
commit22a20dbb7a874c0c99edfa4d1a5d4bee32f3bb08
tree812cb69d600d9d76ccf49d32bfe0b777ad2ba23a
parent3c020b69595954ac18ba27d6b1d8009f7e6bad29
parent164376483f231bc5a488fbee28679df440d6edcb
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: use frame queue to determine last used pos
  ffplay: factorize frame queue operations

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