Commit 22b6e101 authored by James Almer's avatar James Almer

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

parent a024c3ce
...@@ -100,6 +100,7 @@ Stuff that didn't reach the codebase: ...@@ -100,6 +100,7 @@ Stuff that didn't reach the codebase:
- 4de220d2e frame: allow align=0 (meaning automatic) for av_frame_get_buffer() - 4de220d2e frame: allow align=0 (meaning automatic) for av_frame_get_buffer()
- Support recovery from an already present HLS playlist (see 16cb06bb30) - 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) - 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: Collateral damage that needs work locally:
------------------------------------------ ------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment