]> git.sesse.net Git - ffmpeg/commit
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)
commit725ae0e2d0222f81b5cca3b0b226116ec6fd0494
tree3b431d591c55ae3d9fff0cc554833f6c3444899a
parentd204b7ff610cb8dac1116e7a4fd3068733cb5adf
parent1efbbfedcaf4a3cecab980273ad809ba3ade2f74
Merge commit '1efbbfedcaf4a3cecab980273ad809ba3ade2f74'

* commit '1efbbfedcaf4a3cecab980273ad809ba3ade2f74':
  examples/qsvdec: do not set the deprecated field refcounted_frames

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