]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48cc083 bc73999)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.