[tvheadend/f24] (2 commits) ...Fix build with FFmpeg >= 3.1