* commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d': matroskaenc: Allow VP9 and Opus in webm Conflicts: libavformat/matroskaenc.c See: 820ffaed0f Merged-by: Michael Niedermayer <michaelni@gmx.at>
820ffaed0f