Tvheadend

In order to keep the changes from https://github.com/tvheadend/tvheadend/pull/1522 in sync with master, I decided to write a patch.
Patch is available in:
https://github.com/uknunknown/tvh-ffmpeg6

Please post any positive or negative results in this thread.