Merge commit 'b68e353136db6f963212c457281d9716516cdc59'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 12:11:51 +0000 (14:11 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 12:11:51 +0000 (14:11 +0200)
commit3c085c1ba56dfa33742e3b764c5272aca515a23c
tree821896344f81c6ac046637429aba3fe91cbbd833
parent86b2c7d422fab1afe1e3c9b3a5fd5d56ad1f3b1d
parentb68e353136db6f963212c457281d9716516cdc59
Merge commit 'b68e353136db6f963212c457281d9716516cdc59'

* commit 'b68e353136db6f963212c457281d9716516cdc59':
  qsvdec: do not sync PIX_FMT_QSV surfaces

Merged-by: Clément Bœsch <cboesch@gopro.com>
libavcodec/qsvdec.c
libavcodec/version.h