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