]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 133d815 ef1ccea)
Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Feb 2015 22:45:54 +0000 (23:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Feb 2015 22:45:57 +0000 (23:45 +0100)
* cus/stable:
  ffplay: factorize thread starting and stopping code into decoder
  ffplay: make eof part of videostate and signal it when opening a stream
  ffplay: update frame timer based on last updated clock time when toggling pause

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.