|
|
@ -4754,26 +4754,26 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, |
|
|
|
i = -1; |
|
|
|
i = -1; |
|
|
|
ff_mpeg4_pred_dc(s, n, 0, &dc_pred_dir, 0); |
|
|
|
ff_mpeg4_pred_dc(s, n, 0, &dc_pred_dir, 0); |
|
|
|
} |
|
|
|
} |
|
|
|
if (!coded) |
|
|
|
if (!coded) |
|
|
|
goto not_coded; |
|
|
|
goto not_coded; |
|
|
|
|
|
|
|
|
|
|
|
if(rvlc){ |
|
|
|
if(rvlc){ |
|
|
|
rl = &rvlc_rl_intra; |
|
|
|
rl = &rvlc_rl_intra; |
|
|
|
rl_vlc = rvlc_rl_intra.rl_vlc[0]; |
|
|
|
rl_vlc = rvlc_rl_intra.rl_vlc[0]; |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
rl = &rl_intra; |
|
|
|
rl = &rl_intra; |
|
|
|
rl_vlc = rl_intra.rl_vlc[0]; |
|
|
|
rl_vlc = rl_intra.rl_vlc[0]; |
|
|
|
} |
|
|
|
} |
|
|
|
if (s->ac_pred) { |
|
|
|
if (s->ac_pred) { |
|
|
|
if (dc_pred_dir == 0) |
|
|
|
if (dc_pred_dir == 0) |
|
|
|
scan_table = s->intra_v_scantable.permutated; /* left */ |
|
|
|
scan_table = s->intra_v_scantable.permutated; /* left */ |
|
|
|
else |
|
|
|
else |
|
|
|
scan_table = s->intra_h_scantable.permutated; /* top */ |
|
|
|
scan_table = s->intra_h_scantable.permutated; /* top */ |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
scan_table = s->intra_scantable.permutated; |
|
|
|
scan_table = s->intra_scantable.permutated; |
|
|
|
} |
|
|
|
} |
|
|
|
qmul=1; |
|
|
|
qmul=1; |
|
|
|
qadd=0; |
|
|
|
qadd=0; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
i = -1; |
|
|
|
i = -1; |
|
|
|
if (!coded) { |
|
|
|
if (!coded) { |
|
|
|