RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 04:42:10 +00:00
Code Issues Releases Wiki Activity

audio/format: fix Type 'struct entry' has incompatible definitions in different translation units

Browse Source 
`struct entry` already exists from <search.h>, so the one we declare in audio/format.c needs to be named differently
This commit is contained in:
Cœur 2022-10-23 20:21:37 +08:00 committed by sfan5
parent 395b37b005
commit 67260f8aac
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/format.c
View File

@ -187,7 +187,7 @@ int af_format_conversion_score(int dst_format, int src_format)
return score; return score;
} }
struct entry { struct mp_entry {
int fmt; int fmt;
int score; int score;
}; };
@ -195,7 +195,7 @@ struct entry {
static int cmp_entry(const void *a, const void *b) static int cmp_entry(const void *a, const void *b)
{ {
#define CMP_INT(a, b) (a > b ? 1 : (a < b ? -1 : 0)) #define CMP_INT(a, b) (a > b ? 1 : (a < b ? -1 : 0))
return -CMP_INT(((struct entry *)a)->score, ((struct entry *)b)->score); return -CMP_INT(((struct mp_entry *)a)->score, ((struct mp_entry *)b)->score);
} }
// Return a list of sample format compatible to src_format, sorted by order // Return a list of sample format compatible to src_format, sorted by order
@ -207,11 +207,11 @@ static int cmp_entry(const void *a, const void *b)
void af_get_best_sample_formats(int src_format, int *out_formats) void af_get_best_sample_formats(int src_format, int *out_formats)
{ {
int num = 0; int num = 0;
struct entry e[AF_FORMAT_COUNT + 1]; struct mp_entry e[AF_FORMAT_COUNT + 1];
for (int fmt = 1; fmt < AF_FORMAT_COUNT; fmt++) { for (int fmt = 1; fmt < AF_FORMAT_COUNT; fmt++) {
int score = af_format_conversion_score(fmt, src_format); int score = af_format_conversion_score(fmt, src_format);
if (score > INT_MIN) if (score > INT_MIN)
e[num++] = (struct entry){fmt, score}; e[num++] = (struct mp_entry){fmt, score};
} }
qsort(e, num, sizeof(e[0]), cmp_entry); qsort(e, num, sizeof(e[0]), cmp_entry);
for (int n = 0; n < num; n++) for (int n = 0; n < num; n++)