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)
* commit 'd0c8c380ecf3d9bb16621a4fb59ebbcde301002a':
  qsv: document AVQSVContext members

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

Simple merge