projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c020b6 1643764)
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)
* cus/stable:
  ffplay: use frame queue to determine last used pos
  ffplay: factorize frame queue operations

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

Trivial merge
FFmpeg git repo