Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 17:28:40 +0000 (18:28 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 17:28:40 +0000 (18:28 +0100)
commited223eeab34c251856e17440ff17a1faaf4f2560
tree5d6541c4d06b4e6181ca577501460d9a58482093
parentf4a39ceea0d25a21c9c6e0cc64a0825fd5d84c5b
parentd42809f9835a4e9e5c7c63210abb09ad0ef19cfb
Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'

* commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb':
  av1: Add codec_id and basic demuxing support

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavformat/matroska.c
libavformat/riff.c