avformat/hlsenc: avformat/hlsenc: add error message for encrypt fmp4 mode
authorSteven Liu <lq@chinaffmpeg.org>
Mon, 16 Apr 2018 06:35:14 +0000 (14:35 +0800)
committerSteven Liu <lq@chinaffmpeg.org>
Mon, 16 Apr 2018 06:35:14 +0000 (14:35 +0800)
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>
libavformat/hlsenc.c

index c754016..c27a66e 100644 (file)
@@ -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)) {