Merge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 13:07:34 +0000 (14:07 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 13:07:41 +0000 (14:07 +0100)
commit030e69b4dcb92f3b0372c9af1cefba60e9135010
tree416bad22b7551a65ff9e54a47511da5d5d6346d6
parentd76972b58156fc09d0caf26d4bd6462c22be51f1
parenta9e1f2cc61cbd5606a087a60565e87923c39de5a
Merge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a'

* commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a':
  examples/qsvdec: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>