diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-05 19:13:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-10 02:17:52 +0200 |
| commit | 6ff6a51b863733f2a3a737cdbfe492fa9cefe16b (patch) | |
| tree | 2715a05b74a6974e6a1f4d0f656db17f7758a014 /libavcodec/dsputil_template.c | |
| parent | e8b9e1e2942355660e246cf4b9a18ce1a095419f (diff) | |
| download | android_external_ffmpeg-6ff6a51b863733f2a3a737cdbfe492fa9cefe16b.tar.gz android_external_ffmpeg-6ff6a51b863733f2a3a737cdbfe492fa9cefe16b.tar.bz2 android_external_ffmpeg-6ff6a51b863733f2a3a737cdbfe492fa9cefe16b.zip | |
h264: limit 10bpp MC pading trick to 10bpp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil_template.c')
| -rw-r--r-- | libavcodec/dsputil_template.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index 72d8d4ae59..4258f0fb00 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -832,7 +832,7 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_v_lowpass)(uint8_t *p_dst, uint8 static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *p_dst, pixeltmp *tmp, uint8_t *p_src, int dstStride, int tmpStride, int srcStride){\ const int h=2;\ const int w=2;\ - const int pad = (BIT_DEPTH > 9) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\ + const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\ INIT_CLIP\ int i;\ pixel *dst = (pixel*)p_dst;\ @@ -913,7 +913,7 @@ static void FUNC(OPNAME ## h264_qpel4_v_lowpass)(uint8_t *p_dst, uint8_t *p_src, static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t *p_dst, pixeltmp *tmp, uint8_t *p_src, int dstStride, int tmpStride, int srcStride){\ const int h=4;\ const int w=4;\ - const int pad = (BIT_DEPTH > 9) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\ + const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\ INIT_CLIP\ int i;\ pixel *dst = (pixel*)p_dst;\ @@ -1013,7 +1013,7 @@ static void FUNC(OPNAME ## h264_qpel8_v_lowpass)(uint8_t *p_dst, uint8_t *p_src, static void FUNC(OPNAME ## h264_qpel8_hv_lowpass)(uint8_t *p_dst, pixeltmp *tmp, uint8_t *p_src, int dstStride, int tmpStride, int srcStride){\ const int h=8;\ const int w=8;\ - const int pad = (BIT_DEPTH > 9) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\ + const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\ INIT_CLIP\ int i;\ pixel *dst = (pixel*)p_dst;\ |