From: Mark Thompson Date: Sun, 12 Mar 2017 14:21:37 +0000 (+0000) Subject: Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d' X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=210dd7bbb2c0e4013fd8519d3b20e3032f0beb18;p=ffmpeg Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d' * commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d': qsv: handle the semi-packed formats in map_fourcc as well Merged-by: Mark Thompson --- 210dd7bbb2c0e4013fd8519d3b20e3032f0beb18