diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 12:15:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 12:15:25 +0100 |
| commit | 9b9411c1cf97da1eeb8a1f09281ed7455590beb3 (patch) | |
| tree | e66066b7704bc07f44fcfe36553d6376117ec1b3 /libavutil/arm/float_dsp_init_neon.c | |
| parent | 54825047ab7f6f20f0e18d879ab212daa7864b81 (diff) | |
| parent | eac49477aa95cf727d87d2741ee8e60be59d394b (diff) | |
| download | ffmpeg-9b9411c1cf97da1eeb8a1f09281ed7455590beb3.tar.gz | |
Merge commit 'eac49477aa95cf727d87d2741ee8e60be59d394b' into release/2.4
* commit 'eac49477aa95cf727d87d2741ee8e60be59d394b':
gifdec: refactor interleave end handling
Conflicts:
libavcodec/gifdec.c
See: 8f1457864be8fb9653643519dea1c6492f1dde57
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/float_dsp_init_neon.c')
0 files changed, 0 insertions, 0 deletions