From: Clément Bœsch Date: Wed, 22 Mar 2017 17:12:21 +0000 (+0100) Subject: Merge commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5' X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5aee649919992a9e317f1a30ca0483fb5acebb05;p=ffmpeg Merge commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5' * commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5': pthread_frame: use atomics for PerThreadContext.state This commit is a noop, see 749262693247808e2db5a2eb29a11ad3cfec211c Merged-by: Clément Bœsch --- 5aee649919992a9e317f1a30ca0483fb5acebb05