Merge commit '6829a079444e10818a847e153121fb458cc5c0a8'
authorJames Almer <jamrial@gmail.com>
Mon, 12 Feb 2018 01:44:12 +0000 (22:44 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 12 Feb 2018 01:44:12 +0000 (22:44 -0300)
commit87faeb1e685eedc49d9cb6de14bab1cfc88ab655
tree13f943fe2c1212e27d3bdac766c19d9b7cf39fee
parentb7d476b1384fe0e4a2c4d424d880d9c4f0b6f7ca
parent6829a079444e10818a847e153121fb458cc5c0a8
Merge commit '6829a079444e10818a847e153121fb458cc5c0a8'

* commit '6829a079444e10818a847e153121fb458cc5c0a8':
  qsvdec: Relax the surface vs coded dimension check

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/qsv.c
libavcodec/qsvdec.c