Commit 783df2eb authored by Steven Liu's avatar Steven Liu

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: 's avatarGyan Doshi <ffmpeg@gyani.pro>
Signed-off-by: 's avatarSteven Liu <lq@chinaffmpeg.org>
parent edecd723
......@@ -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)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment