[FFmpeg-cvslog] Merge commit '47687a2f8aca3f65b6fdd117b1cb66a7409a7fd1'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Dec 14 19:10:12 2017 -0300| [980af9a88cfd743d71fad67e7dd905231ea0a4f7] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=980af9a88cfd743d71fad67e7dd905231ea0a4f7
---