[FFmpeg-cvslog] doc/libav-merge: add a line about the previous skipped merge

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Feb 20 13:51:19 2019 -0300| [22b6e1011caa9102fafcb4d120792c772c554ba9] | committer: James Almer

doc/libav-merge: add a line about the previous skipped merge

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

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

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index d5e671ca55..bcd0aacba5 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -100,6 +100,7 @@ Stuff that didn't reach the codebase:
   - 4de220d2e frame: allow align=0 (meaning automatic) for av_frame_get_buffer()
 - Support recovery from an already present HLS playlist (see 16cb06bb30)
 - Remove all output devices (see 8e7e042d41, 8d3db95f20, 6ce13070bd, d46cd24986 and https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/216904.html)
+- avcodec/libaomenc: export the Sequence Header OBU as extradata (See a024c3ce9a)
 
 Collateral damage that needs work locally:
 ------------------------------------------