diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-22 16:42:53 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-22 16:42:53 +0100 |
| commit | f015711ed1244fe8c09fd470262b57dfce6a2dbf (patch) | |
| tree | ed9dd904e96149a9563b5295f572cd663f9bc5d1 /libavformat/tedcaptionsdec.c | |
| parent | 2d6f7e6c74bd6c4c74428bb0dcf9f12925441a7c (diff) | |
| parent | eb34d40354e2474517c9b9bd787e0dadc89c2a81 (diff) | |
| download | ffmpeg-f015711ed1244fe8c09fd470262b57dfce6a2dbf.tar.gz | |
Merge commit 'eb34d40354e2474517c9b9bd787e0dadc89c2a81'
* commit 'eb34d40354e2474517c9b9bd787e0dadc89c2a81':
Add a compat dummy stdatomic.h used when threading is disabled
Add a compat stdatomic.h implementation based on pthreads
Add a compat stdatomic.h implementation based on suncc atomics
Add a compat stdatomic.h implementation based on windows atomics
Add a compat stdatomic.h implementation based on GCC atomics
This merge is a noop, see:
41e891e89e Add a compat dummy stdatomic.h used when threading is disabled
74b5f10862 Add a compat stdatomic.h implementation based on pthreads
70faadc826 Add a compat stdatomic.h implementation based on suncc atomics
c91e72ed52 Add a compat stdatomic.h implementation based on windows atomics
3359eede8f Add a compat stdatomic.h implementation based on GCC atomics
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/tedcaptionsdec.c')
0 files changed, 0 insertions, 0 deletions