generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Nicolas George 2013-03-05 14:10:10 +01:00
parent b1a2684936
commit 3ab25e4574
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/concatdec.c
View File

@ -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",
};

2
libavformat/version.h
View File

@ -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, \