Merge commit '7295b7373862ee54903b33d6ef3335531dfa93ad'
authorRodger Combs <rodger.combs@gmail.com>
Tue, 26 Sep 2017 17:13:09 +0000 (14:13 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 17:13:09 +0000 (14:13 -0300)
commit1b8ef01f04ab2210a26b59d3a1a62daed52ce88a
tree3c355249b5528100bda66c836faa55eba98ee0f9
parenta9f51d19d6b58f9e75451d891a85a3617ab1fa56
parent7295b7373862ee54903b33d6ef3335531dfa93ad
Merge commit '7295b7373862ee54903b33d6ef3335531dfa93ad'

* commit '7295b7373862ee54903b33d6ef3335531dfa93ad':
  dashenc: add webm support

Merged-by: Rodger Combs <rodger.combs@gmail.com>
libavformat/dashenc.c
libavformat/version.h