2017-07-25 11:42 GMT+08:00 Steven Liu <l...@chinaffmpeg.org>: > From: Steven Liu <l...@chinaffmpeg.com> > > because the commit id 3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8 > have been done for OPENSSL at hlsenc. > > Signed-off-by: Steven Liu <l...@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. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
