]> git.sesse.net Git - ffmpeg/commit
Merge commit 'bc7399934def210c2a84ea51375d50f79c676c96'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 15:53:56 +0000 (16:53 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 15:53:56 +0000 (16:53 +0100)
commitf91bf71d69d9d9edb4141988367e043357ec7ec7
tree9e58c1b0343fe456047bd123434177be4296097c
parent48cc083a301f94af44b996e4c005b342aedb6038
parentbc7399934def210c2a84ea51375d50f79c676c96
Merge commit 'bc7399934def210c2a84ea51375d50f79c676c96'

* commit 'bc7399934def210c2a84ea51375d50f79c676c96':
  libdc1394: Distinguish between enumeration errors and no cameras found

This commit is a noop, see 384251daffb98d88b0fe897b341bb68445f885de

Merged-by: Clément Bœsch <u@pkh.me>