changeset 6341:b7a16d6df72a libavformat

Add WebM to the Matroska demuxer name.
author alexc
date Sun, 01 Aug 2010 00:30:37 +0000
parents 3ef72a19674e
children 29171d6af13b
files avformat.h matroskadec.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/avformat.h	Fri Jul 30 23:41:12 2010 +0000
+++ b/avformat.h	Sun Aug 01 00:30:37 2010 +0000
@@ -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/matroskadec.c	Fri Jul 30 23:41:12 2010 +0000
+++ b/matroskadec.c	Sun Aug 01 00:30:37 2010 +0000
@@ -1899,8 +1899,8 @@
 }
 
 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,