[FFmpeg-cvslog] sws: use av_clip() instead of av_clip_c()
Clément Bœsch
git at videolan.org
Tue Sep 16 16:57:38 CEST 2014
ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Tue Sep 16 10:08:09 2014 +0200| [d469aa8cfaa9ab6dceb9b8e5d072acc4b20aac8c] | committer: Clément Bœsch
sws: use av_clip() instead of av_clip_c()
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d469aa8cfaa9ab6dceb9b8e5d072acc4b20aac8c
---
libswscale/swscale.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 59ead12..e54d448 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -804,9 +804,9 @@ static void xyz12Torgb48(struct SwsContext *c, uint16_t *dst,
c->xyz2rgb_matrix[2][2] * z >> 12;
// limit values to 12-bit depth
- r = av_clip_c(r,0,4095);
- g = av_clip_c(g,0,4095);
- b = av_clip_c(b,0,4095);
+ r = av_clip(r, 0, 4095);
+ g = av_clip(g, 0, 4095);
+ b = av_clip(b, 0, 4095);
// convert from sRGBlinear to RGB and scale from 12bit to 16bit
if (desc->flags & AV_PIX_FMT_FLAG_BE) {
@@ -860,9 +860,9 @@ static void rgb48Toxyz12(struct SwsContext *c, uint16_t *dst,
c->rgb2xyz_matrix[2][2] * b >> 12;
// limit values to 12-bit depth
- x = av_clip_c(x,0,4095);
- y = av_clip_c(y,0,4095);
- z = av_clip_c(z,0,4095);
+ x = av_clip(x, 0, 4095);
+ y = av_clip(y, 0, 4095);
+ z = av_clip(z, 0, 4095);
// convert from XYZlinear to X'Y'Z' and scale from 12bit to 16bit
if (desc->flags & AV_PIX_FMT_FLAG_BE) {
More information about the ffmpeg-cvslog
mailing list