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)
commit723a542d6c67de2946dbb7f782393c8c2bee8e0b
treef704692743523137f8c8986462e6cf4f94b2aeca
parent562f386c77151d5d59151071106170589bce8e63
parentd9ec3c60143babe1bb77c268e1d5547d15acd69b
Merge commit 'd9ec3c60143babe1bb77c268e1d5547d15acd69b'

* commit 'd9ec3c60143babe1bb77c268e1d5547d15acd69b':
  qsvenc: take only the allocated dimensions from the frames context

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