Mercurial > libavcodec.hg
comparison wmv2.c @ 4594:a96d905dcbaa libavcodec
Add av_ prefix to clip functions
| author | reimar |
|---|---|
| date | Sun, 25 Feb 2007 10:27:12 +0000 |
| parents | 018b316baca7 |
| children | 6a4e8b52dc7b |
comparison
equal
deleted
inserted
replaced
| 4593:2aea8bf268d8 | 4594:a96d905dcbaa |
|---|---|
| 639 src_x = s->mb_x * 16 + (motion_x >> 1); | 639 src_x = s->mb_x * 16 + (motion_x >> 1); |
| 640 src_y = s->mb_y * 16 + (motion_y >> 1); | 640 src_y = s->mb_y * 16 + (motion_y >> 1); |
| 641 | 641 |
| 642 /* WARNING: do no forget half pels */ | 642 /* WARNING: do no forget half pels */ |
| 643 v_edge_pos = s->v_edge_pos; | 643 v_edge_pos = s->v_edge_pos; |
| 644 src_x = clip(src_x, -16, s->width); | 644 src_x = av_clip(src_x, -16, s->width); |
| 645 src_y = clip(src_y, -16, s->height); | 645 src_y = av_clip(src_y, -16, s->height); |
| 646 | 646 |
| 647 if(src_x<=-16 || src_x >= s->width) | 647 if(src_x<=-16 || src_x >= s->width) |
| 648 dxy &= ~3; | 648 dxy &= ~3; |
| 649 if(src_y<=-16 || src_y >= s->height) | 649 if(src_y<=-16 || src_y >= s->height) |
| 650 dxy &= ~4; | 650 dxy &= ~4; |
| 686 my >>= 1; | 686 my >>= 1; |
| 687 } | 687 } |
| 688 | 688 |
| 689 src_x = s->mb_x * 8 + mx; | 689 src_x = s->mb_x * 8 + mx; |
| 690 src_y = s->mb_y * 8 + my; | 690 src_y = s->mb_y * 8 + my; |
| 691 src_x = clip(src_x, -8, s->width >> 1); | 691 src_x = av_clip(src_x, -8, s->width >> 1); |
| 692 if (src_x == (s->width >> 1)) | 692 if (src_x == (s->width >> 1)) |
| 693 dxy &= ~1; | 693 dxy &= ~1; |
| 694 src_y = clip(src_y, -8, s->height >> 1); | 694 src_y = av_clip(src_y, -8, s->height >> 1); |
| 695 if (src_y == (s->height >> 1)) | 695 if (src_y == (s->height >> 1)) |
| 696 dxy &= ~2; | 696 dxy &= ~2; |
| 697 offset = (src_y * uvlinesize) + src_x; | 697 offset = (src_y * uvlinesize) + src_x; |
| 698 ptr = ref_picture[1] + offset; | 698 ptr = ref_picture[1] + offset; |
| 699 if(emu){ | 699 if(emu){ |