aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-03-19 18:37:53 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-03-26 21:52:47 +0100
commit0fae52d7e37a11dada1d26e1f4827c3ccc601311 (patch)
treefe4ffb82af729862bceba84954a507ebe7183bd4
parent50a639a62aa3fdef8a8a701e500acaf61a25c6ff (diff)
downloadffmpeg-0fae52d7e37a11dada1d26e1f4827c3ccc601311.tar.gz
avformat/file: Add crypto to default whitelist
Fixes Ticket5287 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit efa98cdc2ff17a2f3b0ceb69e22864fd5bc433db) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/file.c b/libavformat/file.c
index 595ba3607e..544647f5e6 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 */