Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d'
authorMark Thompson <sw@jkqxz.net>
Sun, 12 Mar 2017 14:21:37 +0000 (14:21 +0000)
committerMark Thompson <sw@jkqxz.net>
Sun, 12 Mar 2017 14:21:37 +0000 (14:21 +0000)
commit210dd7bbb2c0e4013fd8519d3b20e3032f0beb18
tree0240f990dfbbca22c7537bbbd1be4fe1ba3220cf
parent5e193daaa28d2fca34ad21d11d58f0b135388246
parent21962261c74aed4df00ae8348a5e2d1ecb67c52d
Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d'

* commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d':
  qsv: handle the semi-packed formats in map_fourcc as well

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/qsv.c