]> git.sesse.net Git - ffmpeg/commit
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)
commit9ce031c37f13ec4a8c4d15f0eb58a2135305995a
tree2dc5824de2cba922f2a180e93b8455003d89f114
parent5aee649919992a9e317f1a30ca0483fb5acebb05
parent59c70227405c214b29971e6272f3a3ff6fcce3d0
Merge commit '59c70227405c214b29971e6272f3a3ff6fcce3d0'

* 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>