diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 22:12:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 22:12:36 +0200 |
| commit | 56cc754c76d3aba81e121502d0d420242b7023b1 (patch) | |
| tree | e0792f54be291f5dabd4cdb6e8f1576a00974ddd /libavformat/matroskadec.c | |
| parent | c6a3b009249892e7cfac59ca3c2b489e2c88b22b (diff) | |
| parent | f2583bc86eb5d7decc639fc9a36edc93e6003eef (diff) | |
| download | ffmpeg-56cc754c76d3aba81e121502d0d420242b7023b1.tar.gz | |
Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef'
* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
matroska: list supported extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 83c1b3dbe0..f88a4569c2 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3418,6 +3418,7 @@ static int webm_dash_manifest_read_packet(AVFormatContext *s, AVPacket *pkt) 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, |