diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 00:48:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 01:22:42 +0200 |
| commit | 4ebfb2c5ec7dc52cb0f46862a8d37417b8e7551d (patch) | |
| tree | 0e698b377364d688ef420518e17236007702ad90 | |
| parent | a47cc877a072bf6dc0d2c6ff2e138d685b162470 (diff) | |
| download | ffmpeg-4ebfb2c5ec7dc52cb0f46862a8d37417b8e7551d.tar.gz | |
avfilter/vf_rotate: fix location of update operation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/vf_rotate.c | 4 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-rotate | 40 |
2 files changed, 22 insertions, 22 deletions
diff --git a/libavfilter/vf_rotate.c b/libavfilter/vf_rotate.c index 2f55bfc1cc..94aa7c6a42 100644 --- a/libavfilter/vf_rotate.c +++ b/libavfilter/vf_rotate.c @@ -335,8 +335,6 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs) int32_t v; int x1, y1; uint8_t *pin, *pout; - x += c; - y -= s; x1 = x>>16; y1 = y>>16; @@ -372,6 +370,8 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs) break; } } + x += c; + y -= s; } xprime += s; yprime += c; diff --git a/tests/ref/fate/filter-pixfmts-rotate b/tests/ref/fate/filter-pixfmts-rotate index 1a0bf24e29..2ef65da1b1 100644 --- a/tests/ref/fate/filter-pixfmts-rotate +++ b/tests/ref/fate/filter-pixfmts-rotate @@ -1,20 +1,20 @@ -0bgr 8bce6fc2b0532e6dceee3bae394c170b -0rgb b1f893e98c87f32d0131f7f019bd3c10 -abgr a5b742253d41be91ee1726980c39fca5 -argb deb903538e653598c119bfcee2aee651 -bgr0 bdf68c2709492abc5d05cbae373dee7d -bgr24 e669ad05a12b8a5f853b599f38fa9725 -bgra 2353862686c14bbfe3a103aaec8ab6ed -gbrap 4d19ce999a450498fd71c3764b2f9aa7 -gbrp 149393d82ef85a102f62a78aeccc86b6 -gray b40cc829f4310691c717a8162c945fc2 -rgb0 e7b835d6ddfcfe87632604a81c2468e7 -rgb24 1b1b62bd26d83988f4ec51584ebea300 -rgba f0bdbad87cace97926025917a010ffa2 -yuv410p 98b7126c5e00687e033da047ec44dc59 -yuv420p c67848288b31393a1045efb335c533ce -yuv444p 2d017f98f986810246068d2a3af3049b -yuva420p 1ee052f2688c6caf9f08cc9ede7c133e -yuva444p dd7bccf95744e374295be468e882b96d -yuvj420p 34aa87584344e7ba0dbe92f89d865de7 -yuvj444p d1b2eb2ea933839a2cb587043a789313 +0bgr 979522e1115cd253cb531e26216084ee +0rgb 1eadac4ec11fdcc2fe205f1b443f5360 +abgr cff4da9c08268792efadcdb3192cab4d +argb cb9db4de21026dffd63716660b77e104 +bgr0 aa85111028cfcf59d22b21b764e767e3 +bgr24 aad1662159f1b4a7258270a175dcc3f3 +bgra 9eeaa89344ed4266bc6c9bd5ffc03b16 +gbrap 3aab798f7ff4e641bbd710cfea84f5b4 +gbrp f5f2c992b6bbe1a5a11ce361eed95308 +gray 28371cc84367c01807d7ac374343aa37 +rgb0 f843a29d4dd63f27203f05a9475af657 +rgb24 f06c68509dd7a4b3a5ca39f0783edba0 +rgba 029074e91fbcdd43ba2e6e48a0bdbbd5 +yuv410p b98886adb9fc00a8be5e58a515278a48 +yuv420p f3ddf03e0802a292b4cfecdc9f64e522 +yuv444p 1c8f2bd43afbb1de8ec3078ca4f94117 +yuva420p 761944cf562e2a968e8275ce6d750fd7 +yuva444p dbe62d6e155c8b16e7a708efe3967208 +yuvj420p e3750224275c04421e7b9a35af7b8677 +yuvj444p 107d01d31b86dd8381d6c28e5a090281 |