[FFmpeg-cvslog] sws: Skip ff_yuv2rgb_c_init_tables() when the output is YUV

Michael Niedermayer git at videolan.org
Tue Apr 16 18:00:25 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 16 17:50:43 2013 +0200| [13bbfb8fda2123a076fede7bf9063490ed492ed9] | committer: Michael Niedermayer

sws: Skip ff_yuv2rgb_c_init_tables() when the output is YUV

Fixes "20bpp not supported by yuv2rgb" warning

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13bbfb8fda2123a076fede7bf9063490ed492ed9
---

 libswscale/utils.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index d73aa6a..ca7c2c4 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -919,6 +919,7 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
     c->dstFormatBpp = av_get_bits_per_pixel(desc_dst);
     c->srcFormatBpp = av_get_bits_per_pixel(desc_src);
 
+    if (!isYUV(c->dstFormat) && !isGray(c->dstFormat)) {
     ff_yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness,
                              contrast, saturation);
     // FIXME factorize
@@ -926,6 +927,7 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
     if (HAVE_ALTIVEC && av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)
         ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness,
                                        contrast, saturation);
+    }
 
     fill_rgb2yuv_table(c, table, dstRange);
 



More information about the ffmpeg-cvslog mailing list