diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-03-05 14:10:10 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-03-05 14:10:10 +0100 |
| commit | 3ab25e45744c738275992214e1f6f3c24deaa5a2 (patch) | |
| tree | 0f239484ad6aeb1de7bf0bab8a3c175a7e1f4943 /libavformat | |
| parent | b1a26849364878707cf5358b477a4c489baf230a (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')
| -rw-r--r-- | libavformat/concatdec.c | 1 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 1 insertions, 2 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", }; diff --git a/libavformat/version.h b/libavformat/version.h index 082ab9911f..3779bb6d12 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 102 +#define LIBAVFORMAT_VERSION_MICRO 103 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |