]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 01e1887 f5d46d3)
Merge commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 16:24:49 +0000 (17:24 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 16:24:49 +0000 (17:24 +0100)
commit1080b7162f2c6d1e911b91e8097b352a7836b207
tree4ed9bf3cfe01e557e02d72214d3503d2def2a273tree | snapshot
parent01e188762fc4f57cda26a09f63e2d4a4b4bd753ecommit | diff
parentf5d46d332258dcd8ca623019ece1d5e5bb74142bcommit | diff
Merge commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b'

* commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b':
  vmnc: check that subrectangles fit into their containing rectangles

See 6ba02602aa7fc7d38db582e75b8b093fb3c1608d

This merge keeps our condition against w-i and h-j instead of bw and bh.
One may be more correct than the other, but I'm keeping our behaviour
here for safety reasons.

The style and formatting is merged.

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/vmnc.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.