diff options
| author | Steven Liu <lq@chinaffmpeg.org> | 2018-04-16 14:35:14 +0800 |
|---|---|---|
| committer | Steven Liu <lq@chinaffmpeg.org> | 2018-04-16 14:35:14 +0800 |
| commit | 783df2eb59ca2347af89e3eca3aef2ff12779178 (patch) | |
| tree | 01ce1f7d6b4466d82315ca18c9ea4957149df596 /libavformat/hlsenc.c | |
| parent | edecd723f3e4528d5153a00b92343041367fbe06 (diff) | |
| download | ffmpeg-streaming-783df2eb59ca2347af89e3eca3aef2ff12779178.zip ffmpeg-streaming-783df2eb59ca2347af89e3eca3aef2ff12779178.tar.gz | |
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 <ffmpeg@gyani.pro>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Diffstat (limited to 'libavformat/hlsenc.c')
| -rw-r--r-- | libavformat/hlsenc.c | 7 |
1 files changed, 6 insertions, 1 deletions
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)) { |
