]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9da2b37 99aeae2)
Merge commit '99aeae20de4d09ea313fdc619d4e2df825155e62'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:06:37 +0000 (13:06 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:06:37 +0000 (13:06 +0100)
* commit '99aeae20de4d09ea313fdc619d4e2df825155e62':
  scale_npp: fix passthrough mode

This commit is a noop, see f524275ef93882f27c0067e85e8fb3c0fc1a762b

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.