]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '1efbbfedcaf4a3cecab980273ad809ba3ade2f74'
authorMark Thompson <sw@jkqxz.net>
Tue, 16 Jan 2018 22:57:09 +0000 (22:57 +0000)
committerMark Thompson <sw@jkqxz.net>
Tue, 16 Jan 2018 22:57:09 +0000 (22:57 +0000)
* commit '1efbbfedcaf4a3cecab980273ad809ba3ade2f74':
  examples/qsvdec: do not set the deprecated field refcounted_frames

Merged-by: Mark Thompson <sw@jkqxz.net>

Trivial merge