diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
| commit | 79e1aa7cc7a9ac695c3af361bca72013ef272885 (patch) | |
| tree | cc52764dfa4fab2cfc74c6aee5d71b27edbf014b /libaf | |
| parent | 3ba97da297e1e1a5ca9dabdda60cc6a62f77affc (diff) | |
| parent | 39cb032fd184a62416f1e62d26e05576cfd8dbe4 (diff) | |
| download | mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.bz2 mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.xz | |
Merge svn changes up to r28341
Conflicts:
configure
libmpcodecs/native/rtjpegn.c
Diffstat (limited to 'libaf')
| -rw-r--r-- | libaf/af.h | 2 | ||||
| -rw-r--r-- | libaf/af_resample.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libaf/af.h b/libaf/af.h index 1b2bde6ace..14c3accb12 100644 --- a/libaf/af.h +++ b/libaf/af.h @@ -93,7 +93,7 @@ extern int* af_cpu_speed; // Default init type #ifndef AF_INIT_TYPE -#if defined(HAVE_SSE) || defined(HAVE_3DNOW) +#if HAVE_SSE || HAVE_3DNOW #define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_FAST) #else #define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_SLOW) diff --git a/libaf/af_resample.c b/libaf/af_resample.c index c2cfb4b74f..0953217c4c 100644 --- a/libaf/af_resample.c +++ b/libaf/af_resample.c @@ -36,7 +36,7 @@ slow and to 16 if the machine is fast and has MMX. */ -#if !defined(HAVE_MMX) // This machine is slow +#if !HAVE_MMX // This machine is slow #define L8 #else #define L16 @@ -201,7 +201,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) } // Calculate up and down sampling factors - d=ff_gcd(af->data->rate,n->rate); + d=av_gcd(af->data->rate,n->rate); // If sloppy resampling is enabled limit the upsampling factor if(((s->setup & FREQ_MASK) == FREQ_SLOPPY) && (af->data->rate/d > 5000)){ @@ -209,7 +209,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) int dn=n->rate/2; int m=2; while(af->data->rate/(d*m) > 5000){ - d=ff_gcd(up,dn); + d=av_gcd(up,dn); up/=2; dn/=2; m*=2; } d*=m; |