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

[Mohamed ElMorabity]

Summary of changes:

  5ce9688... First import (*)
  f427729... Fix build with FFmpeg >= 3.1 (*)

(*) This commit already existed in another branch; no separate mail sent