diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-22 17:55:18 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-22 17:55:18 +0100 |
| commit | b7336faa39b8ea26d01817cb6a7bf26a795d0580 (patch) | |
| tree | 2fc8c539f10bede9357e421e32c9b744d9efe120 /libavdevice/v4l2-common.h | |
| parent | 443e9692935f1f6c9abefbc842e9f2f5ae6b065d (diff) | |
| parent | 3a165c187da7d74f46f6c1778294e8c5a3a7151f (diff) | |
| download | ffmpeg-b7336faa39b8ea26d01817cb6a7bf26a795d0580.tar.gz | |
Merge commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f'
* commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f':
v4l2: convert to stdatomic
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavdevice/v4l2-common.h')
| -rw-r--r-- | libavdevice/v4l2-common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavdevice/v4l2-common.h b/libavdevice/v4l2-common.h index 40c716489f..0cbaec8bb9 100644 --- a/libavdevice/v4l2-common.h +++ b/libavdevice/v4l2-common.h @@ -35,7 +35,6 @@ #endif #include <linux/videodev2.h> #endif -#include "libavutil/atomic.h" #include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/log.h" |