Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 14:13:35 +0000 (16:13 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 14:13:35 +0000 (16:13 +0200)
commitf929081f2e64d979fd8c58b17705e9554f99baf9
tree2d0ebbfdefb78f3921f4c4a425a80e3f548a1a3e
parent7093e215d02ed0dc9632f82ac8ccec432d29cd35
parentf5c4d38c78347b09478e21a661befff4b2d44643
Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'

* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
  qsvdec: properly handle asynchronous decoding

Conflicts:
libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/qsv_internal.h
libavcodec/qsvdec.c
libavcodec/qsvdec.h