# HG changeset patch
# User alexc
# Date 1280622637 0
# Node ID b7a16d6df72a8accfb563ce913343f39adedcd68
# Parent  3ef72a19674e3fcf8260b9b365f0a337fdde8362
Add WebM to the Matroska demuxer name.

diff -r 3ef72a19674e -r b7a16d6df72a avformat.h
--- 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, \
diff -r 3ef72a19674e -r b7a16d6df72a matroskadec.c
--- 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,