]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'e328178da90f44690e0076f4dbfd16da9175f441'
authorClément Bœsch <u@pkh.me>
Wed, 15 Mar 2017 22:22:50 +0000 (23:22 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 15 Mar 2017 22:22:50 +0000 (23:22 +0100)
* commit 'e328178da90f44690e0076f4dbfd16da9175f441':
  qsvdec: only access hwaccel_context is the pixel format is QSV

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/qsvdec.c

Simple merge