generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qsort: flip compare direction to match libc qsort()

Browse Source 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-06-22 22:47:30 +02:00
parent e847f41285
commit 0567715a6b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavutil/qsort.h
View File

@ -41,23 +41,23 @@
type *right = end-2;\ type *right = end-2;\
type *left = start+1;\ type *left = start+1;\
type *mid = start + ((end-start)>>1);\ type *mid = start + ((end-start)>>1);\
if(cmp(start, end) < 0) {\ if(cmp(start, end) > 0) {\
if(cmp( end, mid) < 0) FFSWAP(type, *start, *mid);\ if(cmp( end, mid) > 0) FFSWAP(type, *start, *mid);\
else FFSWAP(type, *start, *end);\ else FFSWAP(type, *start, *end);\
}else{\ }else{\
if(cmp(start, mid) < 0) FFSWAP(type, *start, *mid);\ if(cmp(start, mid) > 0) FFSWAP(type, *start, *mid);\
else checksort= 1;\ else checksort= 1;\
}\ }\
if(cmp(mid, end) < 0){ \ if(cmp(mid, end) > 0){ \
FFSWAP(type, *mid, *end);\ FFSWAP(type, *mid, *end);\
checksort=0;\ checksort=0;\
}\ }\
if(start == end-2) break;\ if(start == end-2) break;\
FFSWAP(type, end[-1], *mid);\ FFSWAP(type, end[-1], *mid);\
while(left <= right){\ while(left <= right){\
while(left<=right && cmp(left, end-1) > 0)\ while(left<=right && cmp(left, end-1) < 0)\
left++;\ left++;\
while(left<=right && cmp(right, end-1) < 0)\ while(left<=right && cmp(right, end-1) > 0)\
right--;\ right--;\
if(left <= right){\ if(left <= right){\
FFSWAP(type, *left, *right);\ FFSWAP(type, *left, *right);\
@ -68,7 +68,7 @@
FFSWAP(type, end[-1], *left);\ FFSWAP(type, end[-1], *left);\
if(checksort && (mid == left-1 || mid == left)){\ if(checksort && (mid == left-1 || mid == left)){\
mid= start;\ mid= start;\
while(mid<end && cmp(mid, mid+1) >= 0)\ while(mid<end && cmp(mid, mid+1) <= 0)\
mid++;\ mid++;\
if(mid==end)\ if(mid==end)\
break;\ break;\
@ -83,7 +83,7 @@
end = right;\ end = right;\
}\ }\
}else{\ }else{\
if(cmp(start, end) < 0)\ if(cmp(start, end) > 0)\
FFSWAP(type, *start, *end);\ FFSWAP(type, *start, *end);\
break;\ break;\
}\ }\
@ -104,7 +104,7 @@
unsigned a[2] = {i, i+step};\ unsigned a[2] = {i, i+step};\
unsigned end = FFMIN(i+2*step, (num));\ unsigned end = FFMIN(i+2*step, (num));\
for(j=i; a[0]<i+step && a[1]<end; j++){\ for(j=i; a[0]<i+step && a[1]<end; j++){\
int idx= cmp(p+a[0], p+a[1]) < 0;\ int idx= cmp(p+a[0], p+a[1]) > 0;\
tmp[j] = p[ a[idx]++ ];\ tmp[j] = p[ a[idx]++ ];\
}\ }\
if(a[0]>=i+step) a[0] = a[1];\ if(a[0]>=i+step) a[0] = a[1];\