Add WebM to the Matroska demuxer name.

Originally committed as revision 24639 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago · f7cf0f3148
parent 6341838f3c
commit f7cf0f3148
2 changed files with 3 additions and 3 deletions
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@ -22,7 +22,7 @@
 #define AVFORMAT_AVFORMAT_H

 #define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 77
+#define LIBAVFORMAT_VERSION_MINOR 78
 #define LIBAVFORMAT_VERSION_MICRO  0

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@ -1899,8 +1899,8 @@ static int matroska_read_close(AVFormatContext *s)
 }

 AVInputFormat matroska_demuxer = {
-    "matroska",
-    NULL_IF_CONFIG_SMALL("Matroska file format"),
+    "matroska,webm",
+    NULL_IF_CONFIG_SMALL("Matroska/WebM file format"),
    sizeof(MatroskaDemuxContext),
    matroska_probe,
    matroska_read_header,