[SCM] libav/master: matroska: list supported extensions

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5694831e0693ad70581a766d1f0ebefbbae8bc2f
Author: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:   Wed Jul 23 09:49:24 2014 +0100

    matroska: list supported extensions

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 42204a4..431fe57 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2601,6 +2601,7 @@ static int matroska_read_close(AVFormatContext *s)
 AVInputFormat ff_matroska_demuxer = {
     .name           = "matroska,webm",
     .long_name      = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
+    .extensions     = "mkv,mk3d,mka,mks",
     .priv_data_size = sizeof(MatroskaDemuxContext),
     .read_probe     = matroska_probe,
     .read_header    = matroska_read_header,

-- 
Libav/FFmpeg packaging