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

This reverts commit 6cc12353a88dfb21c4c5a38e6c83280483b0ec88.

Conflicts:
	libavformat/version.h

Allowing to automatically select the concat demuxer raises
security concerns, as it allows a possibly hostile file to
access any file on the system. Guessing the format based on
the file name extension does not allow to enable the safe
mode designed to avoid it.

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 052b4eb..2858bef 100644 (file)
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -289,5 +289,4 @@ 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 082ab99..3779bb6 100644 (file)
--- 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 102
+#define LIBAVFORMAT_VERSION_MICRO 103
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \