[FFmpeg-cvslog] doc/libav_merge: remove line about ADVANCED_PARSER

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Apr 30 17:17:34 2017 -0300| [470ad23a5560eed75544f1702ff102d26cdcda52] | committer: James Almer

doc/libav_merge: remove line about ADVANCED_PARSER

It's been addressed.

Reviewed-by: Hendrik Leppkes <h.leppkes at gmail.com>
Reviewed-by: Aaron Levinson <alevinsn at aracnet.com>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=470ad23a5560eed75544f1702ff102d26cdcda52
---

 doc/libav-merge.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 6f052ec2eb..da9e2757f5 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
-- Remove ADVANCED_PARSER in libavcodec/hevc_parser.c
 - Fix MIPS AC3 downmix
 - hlsenc encryption support may need some adjustment (see edc43c571d)