| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | doc/libav-merge: add a note for the skipped QSV functionality | Hendrik Leppkes | 2016-10-01 | 1 | -0/+1 |
| * | doc/libav-merge: complete TODO section | Clément Bœsch | 2016-10-01 | 1 | -0/+10 |
| * | doc/libav-merge: change gmane link to a ffmpeg.org one | Clément Bœsch | 2016-09-25 | 1 | -1/+1 |
| * | doc: move out merge script to tools | Clément Bœsch | 2016-09-25 | 1 | -31/+5 |
| * | doc: remove codecpar mention in libav-merge.txt | Clément Bœsch | 2016-09-25 | 1 | -1/+0 |
| * | doc&tools: Add murge script, for analyzing 3 way conflicts. | Michael Niedermayer | 2016-08-22 | 1 | -0/+4 |
| * | doc: add Libav merge document | Clément Bœsch | 2016-08-17 | 1 | -0/+110 |
 |
index : delta/ffmpeg.git | |
| git.ffmpeg.org: ffmpeg.git |
| summaryrefslogtreecommitdiff |