fixes for recent ffmpeg
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #420 from dankamongmen/master

fixes for current ffmpeg (libavcodec 54 et al)