Skip to content
Snippets Groups Projects
Commit 754bf121 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'd2ef708c' 


* commit 'd2ef708c':
  matroskaenc: Allow VP9 and Opus in webm

Conflicts:
	libavformat/matroskaenc.c

See: 820ffaed
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 181b2c37 d2ef708c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment