Commit 237da0fa authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

dont calculate stuff if its not used ...

Originally committed as revision 2699 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a75b43fd
......@@ -840,7 +840,8 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
dmin4= s->me.sub_motion_search(s, &mx4, &my4, dmin4,
pred_x4, pred_y4, src_data, ref_data, stride, uvstride, size, h, mv_penalty);
if(s->dsp.me_sub_cmp[0] != s->dsp.mb_cmp[0]){
if(s->dsp.me_sub_cmp[0] != s->dsp.mb_cmp[0]
&& s->avctx->mb_decision == FF_MB_DECISION_SIMPLE){
int dxy;
const int offset= ((block&1) + (block>>1)*stride)*8;
uint8_t *dest_y = s->me.scratchpad + offset;
......@@ -990,7 +991,8 @@ static int interlaced_search(MpegEncContext *s, uint8_t *frame_src_data[3], uint
mv_table[xy][0]= mx_i;
mv_table[xy][1]= my_i;
if(s->dsp.me_sub_cmp[0] != s->dsp.mb_cmp[0]){
if(s->dsp.me_sub_cmp[0] != s->dsp.mb_cmp[0]
&& s->avctx->mb_decision == FF_MB_DECISION_SIMPLE){
int dxy;
//FIXME chroma ME
......
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