Commit 92de4450 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'fa38573c'

* commit 'fa38573c':
  matroska: Register mime types
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8cad7460 fa38573c
...@@ -3438,6 +3438,7 @@ AVInputFormat ff_matroska_demuxer = { ...@@ -3438,6 +3438,7 @@ AVInputFormat ff_matroska_demuxer = {
.read_packet = matroska_read_packet, .read_packet = matroska_read_packet,
.read_close = matroska_read_close, .read_close = matroska_read_close,
.read_seek = matroska_read_seek, .read_seek = matroska_read_seek,
.mime_type = "audio/webm,audio/x-matroska,video/webm,video/x-matroska"
}; };
AVInputFormat ff_webm_dash_manifest_demuxer = { AVInputFormat ff_webm_dash_manifest_demuxer = {
......
Markdown is supported
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