[FFmpeg-cvslog] swscale: Kill non-compiling disabled cruft
Diego Biurrun
git at videolan.org
Sun Mar 19 16:40:10 EET 2017
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Jul 30 13:47:34 2016 +0200| [aa37d2bf4505afc106e2a23c44afc722bb204a8e] | committer: Diego Biurrun
swscale: Kill non-compiling disabled cruft
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa37d2bf4505afc106e2a23c44afc722bb204a8e
---
libswscale/swscale_internal.h | 6 ------
libswscale/utils.c | 7 -------
2 files changed, 13 deletions(-)
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index a72ac0b..84f8dd3 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -600,11 +600,6 @@ static av_always_inline int isRGB(enum AVPixelFormat pix_fmt)
return (desc->flags & AV_PIX_FMT_FLAG_RGB);
}
-#if 0 // FIXME
-#define isGray(x) \
- (!(av_pix_fmt_descriptors[x].flags & AV_PIX_FMT_FLAG_PAL) && \
- av_pix_fmt_descriptors[x].nb_components <= 2)
-#else
#define isGray(x) \
((x) == AV_PIX_FMT_GRAY8 || \
(x) == AV_PIX_FMT_YA8 || \
@@ -612,7 +607,6 @@ static av_always_inline int isRGB(enum AVPixelFormat pix_fmt)
(x) == AV_PIX_FMT_GRAY16LE || \
(x) == AV_PIX_FMT_YA16BE || \
(x) == AV_PIX_FMT_YA16LE)
-#endif
#define isRGBinInt(x) \
((x) == AV_PIX_FMT_RGB48BE || \
diff --git a/libswscale/utils.c b/libswscale/utils.c
index ba65e2a..c4fb745 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -372,13 +372,6 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
}
coeff *= fone >> (30 + 24);
}
-#if 0
- else if (flags & SWS_X) {
- double p = param ? param * 0.01 : 0.3;
- coeff = d ? sin(d * M_PI) / (d * M_PI) : 1.0;
- coeff *= pow(2.0, -p * d * d);
- }
-#endif
else if (flags & SWS_X) {
double A = param[0] != SWS_PARAM_DEFAULT ? param[0] : 1.0;
double c;
More information about the ffmpeg-cvslog
mailing list