Merge commit 'd9ec3c60143babe1bb77c268e1d5547d15acd69b'
authorMark Thompson <sw@jkqxz.net>
Sun, 12 Mar 2017 15:06:07 +0000 (15:06 +0000)
committerMark Thompson <sw@jkqxz.net>
Sun, 12 Mar 2017 15:06:07 +0000 (15:06 +0000)
* commit 'd9ec3c60143babe1bb77c268e1d5547d15acd69b':
  qsvenc: take only the allocated dimensions from the frames context

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

Simple merge