]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e5ebd0 c2b0bea)
Merge commit 'c2b0bea40f1fd4399ff6184a2df4f397c0f4b3ab'
authorJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 23:58:26 +0000 (20:58 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 23:58:26 +0000 (20:58 -0300)
* commit 'c2b0bea40f1fd4399ff6184a2df4f397c0f4b3ab':
  avconv_hw: Free device on initialisation failure
  vf_hwmap: Properly free a locally derived device
  vf_hwmap: Add missing error code
  configure: Fix handling of _select dependencies

This commit is a noop, see
6dfcbd80ad446ff163b47f2bf432bbf706436ea8
d984b29b21f6442fb6a809c08c07533dd496b1f9
70808859ddf4c636472b56f5ec637c4754276867
f434ddf48e084a7a5631e7a9dd1d9771d97e114c

Merged-by: James Almer <jamrial@gmail.com>

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