]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 374f818 47687a2)
Merge commit '47687a2f8aca3f65b6fdd117b1cb66a7409a7fd1'
authorJames Almer <jamrial@gmail.com>
Thu, 14 Dec 2017 22:10:12 +0000 (19:10 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 14 Dec 2017 22:10:12 +0000 (19:10 -0300)
* commit '47687a2f8aca3f65b6fdd117b1cb66a7409a7fd1':
  avcodec: add metadata to identify wrappers and hardware decoders

This commit is a noop, see b945fed629a872d393f59d16fc5773574126ca88

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

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