diff options
| author | Steven Liu <lq@chinaffmpeg.org> | 2017-08-04 22:18:22 +0800 |
|---|---|---|
| committer | Steven Liu <lq@chinaffmpeg.org> | 2017-08-04 22:18:22 +0800 |
| commit | 44e9783ab9a1a26d718a9360adfb528d5015df6e (patch) | |
| tree | f5a960f05799fdcfec27a4ed1cc5a47c7b676015 /doc/libav-merge.txt | |
| parent | 738b29cfb69b82965fd71d00da85f162b04a171e (diff) | |
| download | ffmpeg-44e9783ab9a1a26d718a9360adfb528d5015df6e.tar.gz | |
doc/libav-merge: remove the hls merge TODO
This TODO is done.
See 5caaa3a49e76b084ff8a9840d541bad64d96d7f7
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Steven Liu <lq@onvideo.cn>
Diffstat (limited to 'doc/libav-merge.txt')
| -rw-r--r-- | doc/libav-merge.txt | 1 |
1 files changed, 0 insertions, 1 deletions
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: ---------------------------------------------- |