[lives/f24] (2 commits) ...Fix compatibility with ffmpeg-3.0 and GCC-6.1.1.