mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903'
* commit '0b39ac6f54505a538c21fe49a626de94c518c903': gifdec: refactor interleave end handling Conflicts: libavcodec/gifdec.c See: 8f1457864be8fb9653643519dea1c6492f1dde57 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
8af8833591