]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5aee649 59c7022)
Merge commit '59c70227405c214b29971e6272f3a3ff6fcce3d0'
authorClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 17:13:47 +0000 (18:13 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 17:13:47 +0000 (18:13 +0100)
* commit '59c70227405c214b29971e6272f3a3ff6fcce3d0':
  pthread_frame: use atomics for frame progress

This commit is a noop, see b6587421c7799f18038c7c802b62d034ede52f8f

Merged-by: Clément Bœsch <u@pkh.me>

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