summaryrefslogtreecommitdiff
path: root/libavformat/concatdec.c
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-03-05 14:10:10 +0100
committerNicolas George <nicolas.george@normalesup.org>2013-03-05 14:10:10 +0100
commit3ab25e45744c738275992214e1f6f3c24deaa5a2 (patch)
tree0f239484ad6aeb1de7bf0bab8a3c175a7e1f4943 /libavformat/concatdec.c
parentb1a26849364878707cf5358b477a4c489baf230a (diff)
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.
Diffstat (limited to 'libavformat/concatdec.c')
-rw-r--r--libavformat/concatdec.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 052b4eb64f..2858befa3d 100644
--- 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",
};