Merge commit '8aecec84021a61b943718ff3d7c2c57fcd4af199'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:20:05 +0000 (14:20 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:20:05 +0000 (14:20 +0200)
commit27673f1bea1a390785b8c421213bcc53aca969e4
tree7ecd03b74ba2558a5f21e8e367a96f60222b2dec
parentb1284a4b4a6c7f80fa27ef3909929a4a7a950713
parent8aecec84021a61b943718ff3d7c2c57fcd4af199
Merge commit '8aecec84021a61b943718ff3d7c2c57fcd4af199'

* commit '8aecec84021a61b943718ff3d7c2c57fcd4af199':
  qsvdec: make ff_qsv_decode_init() static

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