]> git.sesse.net Git - ffmpeg/commit
Merge commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f'
authorClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 16:55:18 +0000 (17:55 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 16:55:18 +0000 (17:55 +0100)
commitb7336faa39b8ea26d01817cb6a7bf26a795d0580
tree2fc8c539f10bede9357e421e32c9b744d9efe120
parent443e9692935f1f6c9abefbc842e9f2f5ae6b065d
parent3a165c187da7d74f46f6c1778294e8c5a3a7151f
Merge commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f'

* commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f':
  v4l2: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
libavdevice/v4l2-common.h
libavdevice/v4l2.c