[FFmpeg-cvslog] Merge commit 'c23999be134bde0a0554261a9043be7dbc01de0c'