Commit e8ba1cea authored by Kostya Shishkov's avatar Kostya Shishkov

This should make P-frames decoding work on x86 (by avoiding get_bits(0))

Originally committed as revision 5542 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b028a866
...@@ -1341,14 +1341,18 @@ if(v->mv_mode != MV_PMODE_1MV && v->mv_mode != MV_PMODE_1MV_HPEL && v->mv_mode ! ...@@ -1341,14 +1341,18 @@ if(v->mv_mode != MV_PMODE_1MV && v->mv_mode != MV_PMODE_1MV_HPEL && v->mv_mode !
index1 = index%6; \ index1 = index%6; \
if (s->mspel && index1 == 5) val = 1; \ if (s->mspel && index1 == 5) val = 1; \
else val = 0; \ else val = 0; \
val = get_bits(gb, size_table[index1] - val); \ if(size_table[index1] - val > 0) \
val = get_bits(gb, size_table[index1] - val); \
else val = 0; \
sign = 0 - (val&1); \ sign = 0 - (val&1); \
_dmv_x = (sign ^ ((val>>1) + offset_table[index1])) - sign; \ _dmv_x = (sign ^ ((val>>1) + offset_table[index1])) - sign; \
\ \
index1 = index/6; \ index1 = index/6; \
if (s->mspel && index1 == 5) val = 1; \ if (s->mspel && index1 == 5) val = 1; \
else val = 0; \ else val = 0; \
val = get_bits(gb, size_table[index1] - val); \ if(size_table[index1] - val > 0) \
val = get_bits(gb, size_table[index1] - val); \
else val = 0; \
sign = 0 - (val&1); \ sign = 0 - (val&1); \
_dmv_y = (sign ^ ((val>>1) + offset_table[index1])) - sign; \ _dmv_y = (sign ^ ((val>>1) + offset_table[index1])) - sign; \
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment