diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 13:14:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 13:14:48 +0100 |
| commit | 0d31a01d3a5c8f52286e9d4ec359542a6faa79f7 (patch) | |
| tree | d90120c178b37533dbd2b638aaa2e0c07648d01d /libavformat/segment.c | |
| parent | 475d68e0f50140d8a8eb61ab3575d441b31c554b (diff) | |
| parent | 92888e9ed4ea4e761ae953bbe28c85cc658abc8f (diff) | |
| download | ffmpeg-0d31a01d3a5c8f52286e9d4ec359542a6faa79f7.tar.gz | |
Merge commit '92888e9ed4ea4e761ae953bbe28c85cc658abc8f' into release/2.2
* commit '92888e9ed4ea4e761ae953bbe28c85cc658abc8f':
gifdec: refactor interleave end handling
Conflicts:
libavcodec/gifdec.c
See: 8f1457864be8fb9653643519dea1c6492f1dde57
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/segment.c')
0 files changed, 0 insertions, 0 deletions