Merge commit 'd0c8c380ecf3d9bb16621a4fb59ebbcde301002a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:14:10 +0000 (14:14 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:14:10 +0000 (14:14 +0200)
commit029aa8ff140784405533cd4be5051f8733dc5acb
tree7cac30671ed43eb075066e578fd399fd7f9e7a26
parent66682145216f6476426360bdb04cbc6e0e4adbb4
parentd0c8c380ecf3d9bb16621a4fb59ebbcde301002a
Merge commit 'd0c8c380ecf3d9bb16621a4fb59ebbcde301002a'

* commit 'd0c8c380ecf3d9bb16621a4fb59ebbcde301002a':
  qsv: document AVQSVContext members

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/qsv.h