From 783df2eb59ca2347af89e3eca3aef2ff12779178 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 16 Apr 2018 14:35:14 +0800 Subject: avformat/hlsenc: avformat/hlsenc: add error message for encrypt fmp4 mode and refine the warning message when use both hls_key_info_file and hls_enc Reviewed-by: Gyan Doshi Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libavformat/hlsenc.c') diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index c754016..c27a66e 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1591,9 +1591,14 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) } if (c->key_info_file || c->encrypt) { + if (c->segment_type == SEGMENT_TYPE_FMP4) { + av_log(s, AV_LOG_ERROR, "Encrypted fmp4 not yet supported\n"); + return AVERROR_PATCHWELCOME; + } + if (c->key_info_file && c->encrypt) { av_log(s, AV_LOG_WARNING, "Cannot use both -hls_key_info_file and -hls_enc," - " will use -hls_key_info_file priority\n"); + " ignoring -hls_enc\n"); } if (!c->encrypt_started || (c->flags & HLS_PERIODIC_REKEY)) { -- cgit v1.1