diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-15 23:24:37 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-15 23:24:37 +0400 |
| commit | fbc0947d00907c604b95aea34314030f404b7319 (patch) | |
| tree | 5e9aba6a9efffba2cc1db3528b20a0d4c5460291 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86 | |
| parent | 2b9ed578ede7ebd6a3417aa886cf5e1fc70d4e5c (diff) | |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2247 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/h264dsp_mmx.c | 2 | ||||
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/vp56_arith.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/h264dsp_mmx.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/h264dsp_mmx.c index 1dd5874ab..35a016b2f 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/h264dsp_mmx.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/h264dsp_mmx.c @@ -2365,7 +2365,7 @@ void ff_pred4x4_tm_vp8_mmxext (uint8_t *src, const uint8_t *topright, int s void ff_pred4x4_tm_vp8_ssse3 (uint8_t *src, const uint8_t *topright, int stride);
void ff_pred4x4_vertical_vp8_mmxext(uint8_t *src, const uint8_t *topright, int stride);
-#if CONFIG_H264DSP
+#if CONFIG_H264PRED
void ff_h264_pred_init_x86(H264PredContext *h, int codec_id)
{
mm_flags = mm_support();
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/vp56_arith.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/vp56_arith.h index ae3bc3dc7..ddbf38b1a 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/vp56_arith.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/x86/vp56_arith.h @@ -31,7 +31,7 @@ static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob) unsigned int code_word = vp56_rac_renorm(c); unsigned int high = c->high; unsigned int low = 1 + (((high - 1) * prob) >> 8); - unsigned int low_shift = low << 8; + unsigned int low_shift = low << 16; int bit = 0; __asm__( |