mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 08:42:39 +00:00
SWAP
Originally committed as revision 6030 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
0eb6817d98
commit
67eca72dc0
@ -1687,7 +1687,7 @@ void MPV_frame_end(MpegEncContext *s)
|
||||
* @param color color of the arrow
|
||||
*/
|
||||
static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){
|
||||
int t, x, y, fr, f;
|
||||
int x, y, fr, f;
|
||||
|
||||
sx= clip(sx, 0, w-1);
|
||||
sy= clip(sy, 0, h-1);
|
||||
@ -1698,8 +1698,8 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h
|
||||
|
||||
if(ABS(ex - sx) > ABS(ey - sy)){
|
||||
if(sx > ex){
|
||||
t=sx; sx=ex; ex=t;
|
||||
t=sy; sy=ey; ey=t;
|
||||
SWAP(int, sx, ex);
|
||||
SWAP(int, sy, ey);
|
||||
}
|
||||
buf+= sx + sy*stride;
|
||||
ex-= sx;
|
||||
@ -1712,8 +1712,8 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h
|
||||
}
|
||||
}else{
|
||||
if(sy > ey){
|
||||
t=sx; sx=ex; ex=t;
|
||||
t=sy; sy=ey; ey=t;
|
||||
SWAP(int, sx, ex);
|
||||
SWAP(int, sy, ey);
|
||||
}
|
||||
buf+= sx + sy*stride;
|
||||
ey-= sy;
|
||||
|
@ -169,6 +169,8 @@ typedef uint64_t uint_fast64_t;
|
||||
#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
|
||||
#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
|
||||
|
||||
#define SWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
|
||||
|
||||
/* misc math functions */
|
||||
extern FF_IMPORT_ATTR const uint8_t ff_log2_tab[256];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user