diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-11-10 11:46:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-10 11:46:59 +0000 |
| commit | b8a78f419dd67cebc70f78e3d183c7eb4ed10c0e (patch) | |
| tree | f502064c04d45369a01aa2722ac173b80301b8d3 /libavcodec/mpegvideo.c | |
| parent | f11d3f23105f8c7e195990ab2c1728d3dd2f206f (diff) | |
| download | ffmpeg-b8a78f419dd67cebc70f78e3d183c7eb4ed10c0e.tar.gz | |
reversing header game
MIN/MAX -> FFMIN/FFMAX
Originally committed as revision 1184 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 4f139806b7..21690f591f 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1264,10 +1264,10 @@ static void emulated_edge_mc(MpegEncContext *s, UINT8 *src, int linesize, int bl src_x=1-block_w; } - start_y= MAX(0, -src_y); - start_x= MAX(0, -src_x); - end_y= MIN(block_h, h-src_y); - end_x= MIN(block_w, w-src_x); + start_y= FFMAX(0, -src_y); + start_x= FFMAX(0, -src_x); + end_y= FFMIN(block_h, h-src_y); + end_x= FFMIN(block_w, w-src_x); // copy existing part for(y=start_y; y<end_y; y++){ |