From: James Almer <jamrial@gmail.com>
Date: Wed, 20 Feb 2019 16:51:19 +0000 (-0300)
Subject: doc/libav-merge: add a line about the previous skipped merge
X-Git-Tag: n4.3-dev~1143
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/22b6e1011caa9102fafcb4d120792c772c554ba9

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

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index d5e671c..bcd0aac 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:
 ------------------------------------------