diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 17:19:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-15 21:39:32 +0200 |
| commit | 1e0e193240a8e47a980ac76b8b5af831b17b7928 (patch) | |
| tree | 94c567820d1581aacfad6d01f1ba79d28a1df195 /libswscale/swscale_unscaled.c | |
| parent | 60e9b8556ab33af8087968b1de15867ede7c5685 (diff) | |
| download | ffmpeg-1e0e193240a8e47a980ac76b8b5af831b17b7928.tar.gz | |
sws: add dither enum
This allows specifying more dither algorithms without using up flags and
without ambiguities.
Also initialize the new field based on the flags and use it.
Note, improving the logic of the checks is left to subsequent
commits, this here only switches from flags to enum.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 8735c62ba3..49338839d4 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1180,7 +1180,7 @@ void ff_get_unscaled_swscale(SwsContext *c) /* yuv2bgr */ if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUV422P || srcFormat == AV_PIX_FMT_YUVA420P) && isAnyRGB(dstFormat) && - !(flags & (SWS_ACCURATE_RND|SWS_ERROR_DIFFUSION)) && !(dstH & 1)) { + !(flags & SWS_ACCURATE_RND) && c->dither != SWS_DITHER_ED && !(dstH & 1)) { c->swScale = ff_yuv2rgb_get_func_ptr(c); } |