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

Submitted by Steven Liu on July 27, 2017, 10:25 a.m.

Details

Message ID 20170727102538.14508-1-lq@chinaffmpeg.org
State New
Headers show

Commit Message

Steven Liu July 27, 2017, 10:25 a.m.
This TODO is done.
See 5caaa3a49e76b084ff8a9840d541bad64d96d7f7

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

Comments

Steven Liu Aug. 4, 2017, 2:21 p.m.
2017-07-27 18:25 GMT+08:00 Steven Liu <lq@chinaffmpeg.org>:
> This TODO is done.
> See 5caaa3a49e76b084ff8a9840d541bad64d96d7f7
>
> 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

Pushed!

Patch hide | download patch | download mbox

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:
 ----------------------------------------------