diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-18 01:27:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-18 01:27:19 +0200 |
| commit | 56ae5926f739bd26a5aa4add98604b7cd3c2d6ca (patch) | |
| tree | bd21824c32a6018f28d2e3c2c1d810ad77a3d1c5 /libavcodec/tscc2.c | |
| parent | d4838675253513504c4e0d0ed92489b3c4e6cf8d (diff) | |
| parent | 453c02f971fc7865dea396731accbcd7ab6d3728 (diff) | |
| download | ffmpeg-56ae5926f739bd26a5aa4add98604b7cd3c2d6ca.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopenjpeg: introduce encoding support
libopenjpeg: rename decoder source file.
RTMPTS protocol support
RTMPS protocol support
avconv: print an error message when demuxing fails.
tscc2: DCT output should not be clipped
rtmp: Rename rtmphttp to ffrtmphttp
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/libopenjpegenc.c
libavcodec/version.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tscc2.c')
| -rw-r--r-- | libavcodec/tscc2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index 5e36a0e307..9c8d2341ce 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.c @@ -95,7 +95,7 @@ static av_cold int init_vlcs(TSCC2Context *c) OP(d3, 5 * ((s0) - (s1) + (s2)) - 2 * (s3)); \ #define COL_OP(a, b) a = b -#define ROW_OP(a, b) a = av_clip_uint8((((b) + 0x20) >> 6) + 0x80) +#define ROW_OP(a, b) a = (((b) + 0x20) >> 6) + 0x80 static void tscc2_idct4_put(int *in, int q[3], uint8_t *dst, int stride) { |