diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:53:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:53:19 +0200 |
| commit | 0724b4a16d6b88b311610e96c7ba341a4b33965d (patch) | |
| tree | 4e80fea21e5c1dd58bb706cecb95283f81e8846f /libavcodec/h264idct_template.c | |
| parent | 944ad46182483ff52573ec3c827c86058b225d16 (diff) | |
| parent | 62844c3fd66940c7747e9b2bb7804e265319f43f (diff) | |
| download | ffmpeg-0724b4a16d6b88b311610e96c7ba341a4b33965d.tar.gz | |
Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'
* commit '62844c3fd66940c7747e9b2bb7804e265319f43f':
h264: Integrate clear_blocks calls with IDCT
Conflicts:
libavcodec/arm/h264idct_neon.S
libavcodec/h264idct_template.c
libavcodec/x86/h264_idct.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264idct_template.c')
| -rw-r--r-- | libavcodec/h264idct_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264idct_template.c b/libavcodec/h264idct_template.c index 9f16e1d2e0..42c32d15ed 100644 --- a/libavcodec/h264idct_template.c +++ b/libavcodec/h264idct_template.c @@ -145,7 +145,7 @@ void FUNCC(ff_h264_idct_dc_add)(uint8_t *_dst, int16_t *_block, int stride){ pixel *dst = (pixel*)_dst; dctcoef *block = (dctcoef*)_block; int dc = (block[0] + 32) >> 6; - stride >>= sizeof(pixel)-1; + stride /= sizeof(pixel); block[0] = 0; for( j = 0; j < 4; j++ ) { @@ -161,7 +161,7 @@ void FUNCC(ff_h264_idct8_dc_add)(uint8_t *_dst, int16_t *_block, int stride){ dctcoef *block = (dctcoef*)_block; int dc = (block[0] + 32) >> 6; block[0] = 0; - stride >>= sizeof(pixel)-1; + stride /= sizeof(pixel); for( j = 0; j < 8; j++ ) { for( i = 0; i < 8; i++ ) |