[FFmpeg-cvslog] avformat/file: Add crypto to default whitelist
Michael Niedermayer
git at videolan.org
Sat Mar 26 22:36:07 CET 2016
ffmpeg | branch: release/3.0 | Michael Niedermayer <michael at niedermayer.cc> | Sat Mar 19 18:37:53 2016 +0100| [0fae52d7e37a11dada1d26e1f4827c3ccc601311] | committer: Michael Niedermayer
avformat/file: Add crypto to default whitelist
Fixes Ticket5287
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit efa98cdc2ff17a2f3b0ceb69e22864fd5bc433db)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fae52d7e37a11dada1d26e1f4827c3ccc601311
---
libavformat/file.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/file.c b/libavformat/file.c
index 595ba36..544647f 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -349,7 +349,7 @@ URLProtocol ff_file_protocol = {
.url_open_dir = file_open_dir,
.url_read_dir = file_read_dir,
.url_close_dir = file_close_dir,
- .default_whitelist = "file"
+ .default_whitelist = "file,crypto"
};
#endif /* CONFIG_FILE_PROTOCOL */
@@ -388,7 +388,7 @@ URLProtocol ff_pipe_protocol = {
.url_check = file_check,
.priv_data_size = sizeof(FileContext),
.priv_data_class = &pipe_class,
- .default_whitelist = "none"
+ .default_whitelist = "crypto"
};
#endif /* CONFIG_PIPE_PROTOCOL */
More information about the ffmpeg-cvslog
mailing list