[FFmpeg-cvslog] r24639 - in trunk/libavformat: avformat.h matroskadec.c

[alexc]

Author: alexc
Date: Sun Aug  1 02:30:37 2010
New Revision: 24639

Log:
Add WebM to the Matroska demuxer name.

Modified:
   trunk/libavformat/avformat.h
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	Sun Aug  1 01:13:15 2010	(r24638)
+++ trunk/libavformat/avformat.h	Sun Aug  1 02:30:37 2010	(r24639)
@@ -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, \

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	Sun Aug  1 01:13:15 2010	(r24638)
+++ trunk/libavformat/matroskadec.c	Sun Aug  1 02:30:37 2010	(r24639)
@@ -1899,8 +1899,8 @@ static int matroska_read_close(AVFormatC
 }
 
 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,