Add WebM to the Matroska demuxer name.
authorAlex Converse <alex.converse@gmail.com>
Sun, 1 Aug 2010 00:30:37 +0000 (00:30 +0000)
committerAlex Converse <alex.converse@gmail.com>
Sun, 1 Aug 2010 00:30:37 +0000 (00:30 +0000)
Originally committed as revision 24639 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/avformat.h
libavformat/matroskadec.c

index 78a0dd353a1534e46b86c20fae8bbf94b7a85118..452aea68421d527f846da659f0717426fa2a7d27 100644 (file)
@@ -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, \
index 954ef3b863568bf2d843b3c66dbbfd3fba1ed740..60f03ce362e85e8e0a2ccf3abb12610b962a21ab 100644 (file)
@@ -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,