mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-27 19:07:31 +09:00
ffvpx: update ffmpeg to 3.4.9
This commit is contained in:
parent
c45d02ceb2
commit
9ab5fe7274
20 changed files with 137 additions and 75 deletions
|
|
@ -297,7 +297,7 @@ static double eval_expr(Parser *p, AVExpr *e)
|
|||
double d = eval_expr(p, e->param[0]);
|
||||
double d2 = eval_expr(p, e->param[1]);
|
||||
switch (e->type) {
|
||||
case e_mod: return e->value * (d - floor((!CONFIG_FTRAPV || d2) ? d / d2 : d * INFINITY) * d2);
|
||||
case e_mod: return e->value * (d - floor(d2 ? d / d2 : d * INFINITY) * d2);
|
||||
case e_gcd: return e->value * av_gcd(d,d2);
|
||||
case e_max: return e->value * (d > d2 ? d : d2);
|
||||
case e_min: return e->value * (d < d2 ? d : d2);
|
||||
|
|
|
|||
|
|
@ -134,9 +134,10 @@ static int scalarproduct_fixed_c(const int *v1, const int *v2, int len)
|
|||
return (int)(p >> 31);
|
||||
}
|
||||
|
||||
static void butterflies_fixed_c(int *v1, int *v2, int len)
|
||||
static void butterflies_fixed_c(int *v1s, int *v2, int len)
|
||||
{
|
||||
int i;
|
||||
unsigned int *v1 = v1s;
|
||||
|
||||
for (i = 0; i < len; i++){
|
||||
int t = v1[i] - v2[i];
|
||||
|
|
|
|||
|
|
@ -166,6 +166,8 @@
|
|||
}\
|
||||
}
|
||||
|
||||
#define FF_PTR_ADD(ptr, off) ((off) ? (ptr) + (off) : (ptr))
|
||||
|
||||
#include "libm.h"
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ int av_timecode_adjust_ntsc_framenum2(int framenum, int fps)
|
|||
d = framenum / frames_per_10mins;
|
||||
m = framenum % frames_per_10mins;
|
||||
|
||||
return framenum + 9 * drop_frames * d + drop_frames * ((m - drop_frames) / (frames_per_10mins / 10));
|
||||
return framenum + 9U * drop_frames * d + drop_frames * ((m - drop_frames) / (frames_per_10mins / 10));
|
||||
}
|
||||
|
||||
uint32_t av_timecode_get_smpte_from_framenum(const AVTimecode *tc, int framenum)
|
||||
|
|
@ -96,8 +96,8 @@ char *av_timecode_make_string(const AVTimecode *tc, char *buf, int framenum)
|
|||
}
|
||||
ff = framenum % fps;
|
||||
ss = framenum / fps % 60;
|
||||
mm = framenum / (fps*60) % 60;
|
||||
hh = framenum / (fps*3600);
|
||||
mm = framenum / (fps*60LL) % 60;
|
||||
hh = framenum / (fps*3600LL);
|
||||
if (tc->flags & AV_TIMECODE_FLAG_24HOURSMAX)
|
||||
hh = hh % 24;
|
||||
snprintf(buf, AV_TIMECODE_STR_SIZE, "%s%02d:%02d:%02d%c%02d",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue