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

This reverts commit 6cc12353a8.

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.
pull/19/head
Nicolas George 12 years ago
parent b1a2684936
commit 3ab25e4574
  1. 1
      libavformat/concatdec.c
  2. 2
      libavformat/version.h

@ -289,5 +289,4 @@ AVInputFormat ff_concat_demuxer = {
.read_packet = concat_read_packet, .read_packet = concat_read_packet,
.read_close = concat_read_close, .read_close = concat_read_close,
.priv_class = &concat_class, .priv_class = &concat_class,
.extensions = "ffconcat,ffcat",
}; };

@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR 63 #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, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \

Loading…
Cancel
Save