aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-04-26 17:32:40 +0200
committerClément Bœsch <u@pkh.me>2017-04-26 17:32:40 +0200
commit540b8760e84cda1ecab807c808e61a4cfaa1783c (patch)
tree86e032bb5f3fb18e59feaf98e4a835b6323d7f39 /.gitattributes
parent8c6f18e4449ad2bb3c30621b9dca45acc86332cb (diff)
parentd4a91e65343be5d79a4afa61c791191e1b57499a (diff)
downloadffmpeg-540b8760e84cda1ecab807c808e61a4cfaa1783c.tar.gz
Merge commit 'd4a91e65343be5d79a4afa61c791191e1b57499a'
* commit 'd4a91e65343be5d79a4afa61c791191e1b57499a': pthread_frame: do not run hwaccel decoding asynchronously unless it's safe This commit is a noop, see e0cd598bc4684654d63942e9ff4872c0b48a7dc2 Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions