summaryrefslogtreecommitdiff
path: root/libavcodec/wmv2.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2007-02-25 10:27:12 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2007-02-25 10:27:12 +0000
commitf66e4f5f9eac8eb022fad4f85d8d2e99b26c254f (patch)
treeb733686c3306fa6a6a28e70c1d9507d095e22932 /libavcodec/wmv2.c
parent392cf77a4bfd2509fd59da9e5a702ab84476afc0 (diff)
Add av_ prefix to clip functions
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/wmv2.c')
-rw-r--r--libavcodec/wmv2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index f3d4f0f23d..d57eaa5e4a 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -641,8 +641,8 @@ void ff_mspel_motion(MpegEncContext *s,
/* WARNING: do no forget half pels */
v_edge_pos = s->v_edge_pos;
- src_x = clip(src_x, -16, s->width);
- src_y = clip(src_y, -16, s->height);
+ src_x = av_clip(src_x, -16, s->width);
+ src_y = av_clip(src_y, -16, s->height);
if(src_x<=-16 || src_x >= s->width)
dxy &= ~3;
@@ -688,10 +688,10 @@ void ff_mspel_motion(MpegEncContext *s,
src_x = s->mb_x * 8 + mx;
src_y = s->mb_y * 8 + my;
- src_x = clip(src_x, -8, s->width >> 1);
+ src_x = av_clip(src_x, -8, s->width >> 1);
if (src_x == (s->width >> 1))
dxy &= ~1;
- src_y = clip(src_y, -8, s->height >> 1);
+ src_y = av_clip(src_y, -8, s->height >> 1);
if (src_y == (s->height >> 1))
dxy &= ~2;
offset = (src_y * uvlinesize) + src_x;