[pull] master from FFmpeg:master#297

pull[bot] merged 2 commits intohttpsgithu:masterhttpsgithu/FFmpeg:masterfrom

FFmpeg:masterFFmpeg/FFmpeg:masterCopy head branch name to clipboard