diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:19:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:19:11 +0200 |
| commit | 0d83b5722e2875cd4a2ac3574af72b5be633c73d (patch) | |
| tree | 4d42d5d60b334b4cbe13188c97005c7634d58135 /libavcodec/x86/mpegvideo.c | |
| parent | 4390fa6273e603f17a2c7244a5de0d8e36397f59 (diff) | |
| parent | 9cacdabd1c8cd257a942d8289349c37d992989b7 (diff) | |
| download | ffmpeg-0d83b5722e2875cd4a2ac3574af72b5be633c73d.tar.gz | |
Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7'
* commit '9cacdabd1c8cd257a942d8289349c37d992989b7':
jpegls: cosmetics: Drop some unnecessary parentheses
mpegvideo: Remove commented-out PARANOID debug cruft
Conflicts:
libavcodec/jpegls.c
libavcodec/mpegvideo.c
libavcodec/x86/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/mpegvideo.c')
| -rw-r--r-- | libavcodec/x86/mpegvideo.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c index f6db8c85d9..f8cabe5ddb 100644 --- a/libavcodec/x86/mpegvideo.c +++ b/libavcodec/x86/mpegvideo.c @@ -164,28 +164,6 @@ __asm__ volatile( ); } - -/* - We can suppose that result of two multiplications can't be greater than 0xFFFF - i.e. is 16-bit, so we use here only PMULLW instruction and can avoid - a complex multiplication. -===================================================== - Full formula for multiplication of 2 integer numbers - which are represent as high:low words: - input: value1 = high1:low1 - value2 = high2:low2 - output: value3 = value1*value2 - value3=high3:low3 (on overflow: modulus 2^32 wrap-around) - this mean that for 0x123456 * 0x123456 correct result is 0x766cb0ce4 - but this algorithm will compute only 0x66cb0ce4 - this limited by 16-bit size of operands - --------------------------------- - tlow1 = high1*low2 - tlow2 = high2*low1 - tlow1 = tlow1 + tlow2 - high3:low3 = low1*low2 - high3 += tlow1 -*/ static void dct_unquantize_mpeg1_intra_mmx(MpegEncContext *s, int16_t *block, int n, int qscale) { |