Changeset 980af9a8 in ffmpeg

Timestamp:

Dec 14, 2017, 10:10:12 PM (7 years ago)

Author:

James Almer <jamrial@gmail.com>

Branches:

master

Children:

1c76134

Parents:

374f818b (diff), 47687a2f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '47687a2f8aca3f65b6fdd117b1cb66a7409a7fd1'

• 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>

(No files)