Mercurial > libavcodec.hg
comparison svq3.c @ 4594:a96d905dcbaa libavcodec
Add av_ prefix to clip functions
author | reimar |
---|---|
date | Sun, 25 Feb 2007 10:27:12 +0000 |
parents | b0bfea78ca13 |
children | 28ebdd244a07 |
comparison
equal
deleted
inserted
replaced
4593:2aea8bf268d8 | 4594:a96d905dcbaa |
---|---|
283 | 283 |
284 if ((s->flags & CODEC_FLAG_EMU_EDGE)) { | 284 if ((s->flags & CODEC_FLAG_EMU_EDGE)) { |
285 emu = 1; | 285 emu = 1; |
286 } | 286 } |
287 | 287 |
288 mx = clip (mx, -16, (s->h_edge_pos - width + 15)); | 288 mx = av_clip (mx, -16, (s->h_edge_pos - width + 15)); |
289 my = clip (my, -16, (s->v_edge_pos - height + 15)); | 289 my = av_clip (my, -16, (s->v_edge_pos - height + 15)); |
290 } | 290 } |
291 | 291 |
292 /* form component predictions */ | 292 /* form component predictions */ |
293 dest = s->current_picture.data[0] + x + y*s->linesize; | 293 dest = s->current_picture.data[0] + x + y*s->linesize; |
294 src = pic->data[0] + mx + my*s->linesize; | 294 src = pic->data[0] + mx + my*s->linesize; |
359 my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1; | 359 my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1; |
360 } | 360 } |
361 } | 361 } |
362 | 362 |
363 /* clip motion vector prediction to frame border */ | 363 /* clip motion vector prediction to frame border */ |
364 mx = clip (mx, extra_width - 6*x, h_edge_pos - 6*x); | 364 mx = av_clip (mx, extra_width - 6*x, h_edge_pos - 6*x); |
365 my = clip (my, extra_width - 6*y, v_edge_pos - 6*y); | 365 my = av_clip (my, extra_width - 6*y, v_edge_pos - 6*y); |
366 | 366 |
367 /* get (optional) motion vector differential */ | 367 /* get (optional) motion vector differential */ |
368 if (mode == PREDICT_MODE) { | 368 if (mode == PREDICT_MODE) { |
369 dx = dy = 0; | 369 dx = dy = 0; |
370 } else { | 370 } else { |