Mercurial > libavcodec.hg
comparison motion_est.c @ 218:9df2d13e64b2 libavcodec
(commit by michael)
motion-estimation on width/height not divisable through 16 files bugfix
| author | arpi_esp |
|---|---|
| date | Thu, 24 Jan 2002 19:06:47 +0000 |
| parents | ec4642daa6fe |
| children | b640ec5948b0 |
comparison
equal
deleted
inserted
replaced
| 217:de372d04039c | 218:9df2d13e64b2 |
|---|---|
| 407 range = range * 2; | 407 range = range * 2; |
| 408 | 408 |
| 409 if (s->unrestricted_mv) { | 409 if (s->unrestricted_mv) { |
| 410 xmin = -16; | 410 xmin = -16; |
| 411 ymin = -16; | 411 ymin = -16; |
| 412 xmax = s->width; | 412 if(s->avctx==NULL || s->avctx->codec->id!=CODEC_ID_MPEG4){ |
| 413 ymax = s->height; | 413 xmax = s->mb_width*16; |
| 414 ymax = s->mb_height*16; | |
| 415 }else { | |
| 416 /* XXX: dunno if this is correct but ffmpeg4 decoder wont like it otherwise | |
| 417 (cuz the drawn edge isnt large enough))*/ | |
| 418 xmax = s->width; | |
| 419 ymax = s->height; | |
| 420 } | |
| 414 } else { | 421 } else { |
| 415 xmin = 0; | 422 xmin = 0; |
| 416 ymin = 0; | 423 ymin = 0; |
| 417 xmax = s->width - 16; | 424 xmax = s->mb_width*16 - 16; |
| 418 ymax = s->height - 16; | 425 ymax = s->mb_height*16 - 16; |
| 419 } | 426 } |
| 420 | 427 |
| 421 switch(s->full_search) { | 428 switch(s->full_search) { |
| 422 case ME_ZERO: | 429 case ME_ZERO: |
| 423 default: | 430 default: |