aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-05-24 15:18:40 -0400
committerMichael Niedermayer <michaelni@gmx.at>2011-05-28 11:11:58 +0200
commitf2a3b23051c61a38ba5cb04414e6ebe0986041da (patch)
tree75dd42e0f1ec29d926fb8e6112f83f0de43e1273
parent835ab9207e029ebbf7e77a3ae61f89ad7e9df82d (diff)
downloadffmpeg-f2a3b23051c61a38ba5cb04414e6ebe0986041da.tar.gz
swscale: remove if(full_chr_int) from yuv2packed1().
If that flag is set, swScale() already proxies the call to yuv2rgbXinC_full(). Therefore, this flag is never set when yuv2packed1() is called.
-rw-r--r--libswscale/swscale_template.c5
-rw-r--r--libswscale/x86/swscale_template.c5
2 files changed, 0 insertions, 10 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index 6f034c9d6f..586614f989 100644
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -127,11 +127,6 @@ static inline void yuv2packed1_c(SwsContext *c, const uint16_t *buf0,
const uint16_t *buf1= buf0; //FIXME needed for RGB1/BGR1
const int yalpha= 4096; //FIXME ...
- if (flags&SWS_FULL_CHR_H_INT) {
- c->yuv2packed2(c, buf0, buf0, uvbuf0, uvbuf1, abuf0, abuf0, dest, dstW, 0, uvalpha, y);
- return;
- }
-
if (uvalpha < 2048) {
YSCALE_YUV_2_ANYRGB_C(YSCALE_YUV_2_RGB1_C, YSCALE_YUV_2_PACKED1_C(void,0), YSCALE_YUV_2_GRAY16_1_C, YSCALE_YUV_2_MONO2_C)
} else {
diff --git a/libswscale/x86/swscale_template.c b/libswscale/x86/swscale_template.c
index 2494160f8c..4fe53bd73b 100644
--- a/libswscale/x86/swscale_template.c
+++ b/libswscale/x86/swscale_template.c
@@ -1230,11 +1230,6 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, const uint16_t *buf0, cons
{
const uint16_t *buf1= buf0; //FIXME needed for RGB1/BGR1
- if (flags&SWS_FULL_CHR_H_INT) {
- c->yuv2packed2(c, buf0, buf0, uvbuf0, uvbuf1, abuf0, abuf0, dest, dstW, 0, uvalpha, y);
- return;
- }
-
if (uvalpha < 2048) { // note this is not correct (shifts chrominance by 0.5 pixels) but it is a bit faster
switch(dstFormat) {
case PIX_FMT_RGB32: