Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a'

* commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a': matroska: Register mime types Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 92de445034
parent 8cad746093 fa38573cd9
commit 92de445034
1 changed files with 1 additions and 0 deletions
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@ -3438,6 +3438,7 @@ AVInputFormat ff_matroska_demuxer = {
    .read_packet    = matroska_read_packet,
    .read_close     = matroska_read_close,
    .read_seek      = matroska_read_seek,
+    .mime_type      = "audio/webm,audio/x-matroska,video/webm,video/x-matroska"
 };

 AVInputFormat ff_webm_dash_manifest_demuxer = {