Compatibility with ffmpeg 2.6#56

tahajahangir wants to merge 2 commits intosenko:mastersenko/python-video-converter:masterfrom

tahajahangir:test-ffmpeg-2.6tahajahangir/python-video-converter:test-ffmpeg-2.6Copy head branch name to clipboard