[FFmpeg-devel] [PATCH] hls: detect SAMPLE-AES encryption

[Derek Buitenhuis]

On 3/5/2015 5:32 PM, selst wrote:
> From: selsta <selsta at home>

Configure your name and email.

> Date: Thu, 5 Mar 2015 01:26:47 +0100
> Subject: [PATCH] hls: detect SAMPLE-AES encryption

This doesn't look like it was sent with git send-email?

> SAMPLE-AES encryption is not commonly used yet, but without this patch
> ffmpeg is thinking that the hls segments are not encrypted which
> produces broken files.
> 
> I'll try to implement an actual decryption in the next weeks.

[...]

> Sample url to test this patch:
> http://demo.unified-streaming.com/video/caminandes/caminandes-
> sample-aes.ism/caminandes-sample-aes.m3u8

URLs in commit messages tend not to be useful later on.

> +    } 
> +    
> +    else if (seg->key_type == KEY_SAMPLE_AES) {

Should be on same line.

> +        av_log(NULL, AV_LOG_ERROR, "SAMPLE-AES encryption is not
> supported\n");

Use the AVFormatContext, not NULL.

> +        ret = AVERROR_PATCHWELCOME;
>      }
> +
>      else

else and { on the same line.

- Derel