RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-07 07:13:20 +00:00
Code Issues Projects Releases Wiki Activity

lavfi/psnr: rename pow2 to pow_2

Browse Source 
This conflict with the DJGPP libc which includes a pow2 function¹

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.

[1]: http://www.delorie.com/djgpp/doc/libc-2.02/libc_536.html
This commit is contained in:
Clément Bœsch 2017-03-26 20:43:11 +02:00
parent 8f9edf89d5
commit 4ea8f57548
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_psnr.c
View File

@ -70,14 +70,14 @@ static const AVOption psnr_options[] = {
AVFILTER_DEFINE_CLASS(psnr);
static inline unsigned pow2(unsigned base)
static inline unsigned pow_2(unsigned base)
{
return base*base;
}
static inline double get_psnr(double mse, uint64_t nb_frames, int max)
{
return 10.0 * log10(pow2(max) / (mse / nb_frames));
return 10.0 * log10(pow_2(max) / (mse / nb_frames));
}
static uint64_t sse_line_8bit(const uint8_t *main_line, const uint8_t *ref_line, int outw)
@ -86,7 +86,7 @@ static uint64_t sse_line_8bit(const uint8_t *main_line, const uint8_t *ref_line
unsigned m2 = 0;
for (j = 0; j < outw; j++)
m2 += pow2(main_line[j] - ref_line[j]);
m2 += pow_2(main_line[j] - ref_line[j]);
return m2;
}
@ -99,7 +99,7 @@ static uint64_t sse_line_16bit(const uint8_t *_main_line, const uint8_t *_ref_li
const uint16_t *ref_line = (const uint16_t *) _ref_line;
for (j = 0; j < outw; j++)
m2 += pow2(main_line[j] - ref_line[j]);
m2 += pow_2(main_line[j] - ref_line[j]);
return m2;
}