diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 13:14:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 13:28:57 +0100 |
| commit | 8af8833591d3efb26dcb0bb6f660cd0f3f107679 (patch) | |
| tree | ec01249287336149ace41cc75088fafe9653c68b /libavcodec/wavpack.c | |
| parent | 96ff6d38050e42ae33b1a691109e24748bd62d5d (diff) | |
| parent | 0b39ac6f54505a538c21fe49a626de94c518c903 (diff) | |
| download | ffmpeg-8af8833591d3efb26dcb0bb6f660cd0f3f107679.tar.gz | |
Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903'
* commit '0b39ac6f54505a538c21fe49a626de94c518c903':
gifdec: refactor interleave end handling
Conflicts:
libavcodec/gifdec.c
See: 8f1457864be8fb9653643519dea1c6492f1dde57
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wavpack.c')
0 files changed, 0 insertions, 0 deletions