diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-02-25 02:46:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 16:40:11 +0200 |
| commit | 116758a358a2f176a27d521723a6c6c4d2ef52c7 (patch) | |
| tree | a1ca291f401643fa75d56289c69f16a19fc81f5d /libswscale | |
| parent | 151193603402aa2dde105c342b658696ccb441b0 (diff) | |
Fix yuvj420p scaling artefact, issue1108.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_internal.h | 4 | ||||
| -rw-r--r-- | libswscale/swscale_template.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index e6f5c480ce..16c23d2740 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -305,8 +305,8 @@ typedef struct SwsContext { int xInc, const int16_t *filter, const int16_t *filterPos, long filterSize); - void (*lumConvertRange)(uint16_t *dst, int width); ///< Color range conversion function for luma plane if needed. - void (*chrConvertRange)(uint16_t *dst, int width); ///< Color range conversion function for chroma planes if needed. + void (*lumConvertRange)(int16_t *dst, int width); ///< Color range conversion function for luma plane if needed. + void (*chrConvertRange)(int16_t *dst, int width); ///< Color range conversion function for chroma planes if needed. int lumSrcOffset; ///< Offset given to luma src pointers passed to horizontal input functions. int chrSrcOffset; ///< Offset given to chroma src pointers passed to horizontal input functions. diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index b1eeb37465..0ee5181e2e 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -2215,7 +2215,7 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW, const uint8_t *src, in //FIXME all pal and rgb srcFormats could do this convertion as well //FIXME all scalers more complex than bilinear could do half of this transform -static void RENAME(chrRangeToJpeg)(uint16_t *dst, int width) +static void RENAME(chrRangeToJpeg)(int16_t *dst, int width) { int i; for (i = 0; i < width; i++) { @@ -2223,7 +2223,7 @@ static void RENAME(chrRangeToJpeg)(uint16_t *dst, int width) dst[i+VOFW] = (FFMIN(dst[i+VOFW],30775)*4663 - 9289992)>>12; //-264 } } -static void RENAME(chrRangeFromJpeg)(uint16_t *dst, int width) +static void RENAME(chrRangeFromJpeg)(int16_t *dst, int width) { int i; for (i = 0; i < width; i++) { @@ -2231,13 +2231,13 @@ static void RENAME(chrRangeFromJpeg)(uint16_t *dst, int width) dst[i+VOFW] = (dst[i+VOFW]*1799 + 4081085)>>11; //1469 } } -static void RENAME(lumRangeToJpeg)(uint16_t *dst, int width) +static void RENAME(lumRangeToJpeg)(int16_t *dst, int width) { int i; for (i = 0; i < width; i++) dst[i] = (FFMIN(dst[i],30189)*19077 - 39057361)>>14; } -static void RENAME(lumRangeFromJpeg)(uint16_t *dst, int width) +static void RENAME(lumRangeFromJpeg)(int16_t *dst, int width) { int i; for (i = 0; i < width; i++) |