virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/hlsenc: avformat/hlsenc: add error message for encrypt fmp4 mode

Browse Source 
and refine the warning message when use both hls_key_info_file and hls_enc

Reviewed-by: Gyan Doshi <ffmpeg@gyani.pro>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Steven Liu
2018-04-16 14:35:14 +08:00
parent edecd723f3
commit 783df2eb59
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/hlsenc.c
View File

@@ -1591,9 +1591,14 @@ static int hls_start(AVFormatContext *s, VariantStream *vs)
} }
if (c->key_info_file || c->encrypt) { 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) { if (c->key_info_file && c->encrypt) {
av_log(s, AV_LOG_WARNING, "Cannot use both -hls_key_info_file and -hls_enc," 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)) { if (!c->encrypt_started || (c->flags & HLS_PERIODIC_REKEY)) {