]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d':
  qsv: handle the semi-packed formats in map_fourcc as well

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

Simple merge