diff mbox

[FFmpeg-devel] doc/libav-merge: remove the hls merge TODO

Message ID 20170725034240.9109-1-lq@chinaffmpeg.org
State Accepted
Commit 44e9783ab9a1a26d718a9360adfb528d5015df6e
Headers show

Commit Message

Steven Liu July 25, 2017, 3:42 a.m. UTC
From: Steven Liu <lq@chinaffmpeg.com>

because the commit id 3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8
have been done for OPENSSL at hlsenc.

Signed-off-by: Steven Liu <lq@onvideo.cn>
---
 doc/libav-merge.txt | 1 -
 1 file changed, 1 deletion(-)

Comments

Steven Liu July 27, 2017, 3:45 a.m. UTC | #1
2017-07-25 11:42 GMT+08:00 Steven Liu <lq@chinaffmpeg.org>:
> From: Steven Liu <lq@chinaffmpeg.com>
>
> because the commit id 3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8
> have been done for OPENSSL at hlsenc.
>
> Signed-off-by: Steven Liu <lq@onvideo.cn>
> ---
>  doc/libav-merge.txt | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
> index 690c4ef97f..96b008b71b 100644
> --- a/doc/libav-merge.txt
> +++ b/doc/libav-merge.txt
> @@ -105,7 +105,6 @@ Collateral damage that needs work locally:
>  - Merge proresdec2.c and proresdec_lgpl.c
>  - Merge proresenc_anatoliy.c and proresenc_kostya.c
>  - Fix MIPS AC3 downmix
> -- hlsenc encryption support may need some adjustment (see edc43c571d)
>
>  Extra changes needed to be aligned with Libav:
>  ----------------------------------------------
> --
> 2.11.0 (Apple Git-81)
>
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

will push if no objection.
Clément Bœsch July 27, 2017, 5:55 a.m. UTC | #2
On Thu, Jul 27, 2017 at 11:45:32AM +0800, Steven Liu wrote:
> 2017-07-25 11:42 GMT+08:00 Steven Liu <lq@chinaffmpeg.org>:
> > From: Steven Liu <lq@chinaffmpeg.com>
> >
> > because the commit id 3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8
> > have been done for OPENSSL at hlsenc.
> >

I don't understand what you mean here: we need in FFmpeg an equivalent to
the options added in edc43c571d: do we have them? If so, you should
reference them.

[...]
Steven Liu July 27, 2017, 6:10 a.m. UTC | #3
2017-07-27 13:55 GMT+08:00 Clément Bœsch <u@pkh.me>:
> On Thu, Jul 27, 2017 at 11:45:32AM +0800, Steven Liu wrote:
>> 2017-07-25 11:42 GMT+08:00 Steven Liu <lq@chinaffmpeg.org>:
>> > From: Steven Liu <lq@chinaffmpeg.com>
>> >
>> > because the commit id 3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8
>> > have been done for OPENSSL at hlsenc.
>> >
>
> I don't understand what you mean here: we need in FFmpeg an equivalent to
> the options added in edc43c571d: do we have them? If so, you should
> reference them.
All the Encrypt HLS have been done, you could check it.
I think the doc should update, so modify it.

>
> [...]
>
> --
> Clément B.
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
diff mbox

Patch

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 690c4ef97f..96b008b71b 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -105,7 +105,6 @@  Collateral damage that needs work locally:
 - Merge proresdec2.c and proresdec_lgpl.c
 - Merge proresenc_anatoliy.c and proresenc_kostya.c
 - Fix MIPS AC3 downmix
-- hlsenc encryption support may need some adjustment (see edc43c571d)
 
 Extra changes needed to be aligned with Libav:
 ----------------------------------------------