Commit History

Author SHA1 Message Date
  Hendrik Leppkes 3c18188f9f doc/libav-merge: add a note for the skipped QSV functionality 8 years ago
  Clément Bœsch 0fbd423905 doc/libav-merge: complete TODO section 8 years ago
  Clément Bœsch bd9e425459 doc/libav-merge: change gmane link to a ffmpeg.org one 8 years ago
  Clément Bœsch 95a7cbb09d doc: move out merge script to tools 8 years ago
  Clément Bœsch 485f75b278 doc: remove codecpar mention in libav-merge.txt 8 years ago
  Michael Niedermayer 360d3f3c18 doc&tools: Add murge script, for analyzing 3 way conflicts. 8 years ago
  Clément Bœsch 2477775bf8 doc: add Libav merge document 8 years ago