[FFmpeg-cvslog] Merge commit 'b1abd2aaf91be249f24cb74db9c205d9e4ca9da6'