From f7cf0f3148123a0a8c3e09d895104fbc231152f8 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Sun, 1 Aug 2010 00:30:37 +0000 Subject: [PATCH] Add WebM to the Matroska demuxer name. Originally committed as revision 24639 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avformat.h | 2 +- libavformat/matroskadec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 78a0dd353a..452aea6842 100644 --- 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, \ diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 954ef3b863..60f03ce362 100644 --- 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,