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)
* commit '6829a079444e10818a847e153121fb458cc5c0a8':
  qsvdec: Relax the surface vs coded dimension check

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

Simple merge
Simple merge