]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a':
  examples/qsvdec: convert to codecpar

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

Trivial merge