diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 14:17:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 14:17:06 +0100 |
| commit | 02b3ac87f81a614120c492b9df2b294d1c54755e (patch) | |
| tree | 115a08c9d644f9faf3fd60b8657cc5c3c9f173e1 /libswscale/yuv2rgb.c | |
| parent | f2b89f21cc3dfcfda911e621c3ea62f3175eacbe (diff) | |
| parent | 813784a8bf907f6fd1d96c11e85586cee5c05695 (diff) | |
| download | ffmpeg-02b3ac87f81a614120c492b9df2b294d1c54755e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sws: disable yuv2rgb warning for planar rgb.
Conflicts:
libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/yuv2rgb.c')
| -rw-r--r-- | libswscale/yuv2rgb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index e343d05d79..d12abda9a8 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -919,7 +919,7 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], break; default: c->yuvTable = NULL; - if(!isPlanar(c->dstFormat) || bpp<=24) + if(!isPlanar(c->dstFormat) || bpp <= 24) av_log(c, AV_LOG_ERROR, "%ibpp not supported by yuv2rgb\n", bpp); return -1; } |