summaryrefslogtreecommitdiff
path: root/doc/libav-merge.txt
Commit message (Expand)AuthorAge
* doc/libav-merge: add unmerged hevc commits hashesClément Bœsch2017-01-30
* doc/libav-merge: add skipped fixup commits to the list of missing changesHendrik Leppkes2016-11-13
* doc: update merge status for recent additions and skipped mergesHendrik Leppkes2016-11-13
* doc/libav-merge: add a note for the skipped QSV functionalityHendrik Leppkes2016-10-01
* doc/libav-merge: complete TODO sectionClément Bœsch2016-10-01
* doc/libav-merge: change gmane link to a ffmpeg.org oneClément Bœsch2016-09-25
* doc: move out merge script to toolsClément Bœsch2016-09-25
* doc: remove codecpar mention in libav-merge.txtClément Bœsch2016-09-25
* doc&tools: Add murge script, for analyzing 3 way conflicts.Michael Niedermayer2016-08-22
* doc: add Libav merge documentClément Bœsch2016-08-17