]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6c868b 64a31b2)
Merge commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5'
authorClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 17:12:21 +0000 (18:12 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 17:12:21 +0000 (18:12 +0100)
* commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5':
  pthread_frame: use atomics for PerThreadContext.state

This commit is a noop, see 749262693247808e2db5a2eb29a11ad3cfec211c

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

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