[FFmpeg-cvslog] lavf/concatdec: define "ffcat" and "ffconcat" extensions

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Feb 21 19:33:07 2013 +0100| [6cc12353a88dfb21c4c5a38e6c83280483b0ec88] | committer: Stefano Sabatini

lavf/concatdec: define "ffcat" and "ffconcat" extensions

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6cc12353a88dfb21c4c5a38e6c83280483b0ec88
---

 libavformat/concatdec.c |    1 +
 libavformat/version.h   |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 2858bef..052b4eb 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -289,4 +289,5 @@ AVInputFormat ff_concat_demuxer = {
     .read_packet    = concat_read_packet,
     .read_close     = concat_read_close,
     .priv_class     = &concat_class,
+    .extensions     = "ffconcat,ffcat",
 };
diff --git a/libavformat/version.h b/libavformat/version.h
index ec907dd..2136e3f 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR 54
 #define LIBAVFORMAT_VERSION_MINOR 63
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \