Commit 22a20dbb authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: use frame queue to determine last used pos
  ffplay: factorize frame queue operations
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3c020b69 16437648
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment