Diego Biurrun <[email protected]> writes:
> ---
> configure | 3 +++
> libavcodec/Makefile | 3 ++-
> libavcodec/dct-test.c | 4 ++--
> libavcodec/dsputil.c | 2 ++
> libavcodec/faandct.c | 2 +-
> libavcodec/faandct.h | 3 ++-
> libavcodec/mpegvideo_enc.c | 9 +++++----
> 7 files changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/configure b/configure
> index 7418bca..1cd3332 100755
> --- a/configure
> +++ b/configure
> @@ -115,6 +115,7 @@ Component options:
> --enable-x11grab enable X11 grabbing [no]
> --disable-network disable network support [no]
> --disable-dct disable DCT code
> + --disable-faandct disable floating point AAN DCT code
> --disable-mdct disable MDCT code
> --disable-rdft disable RDFT code
> --disable-fft disable FFT code
This is still in the wrong place.
> diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
> index 1787ef6..f0db737 100644
> --- a/libavcodec/dct-test.c
> +++ b/libavcodec/dct-test.c
> @@ -35,7 +35,7 @@
> #include "libavutil/cpu.h"
> #include "libavutil/common.h"
> #include "libavutil/lfg.h"
> -
> +#include "config.h"
> #include "simple_idct.h"
> #include "aandcttab.h"
> #include "faandct.h"
> @@ -74,7 +74,7 @@ struct algo {
> int nonspec;
> };
>
> -#ifndef FAAN_POSTSCALE
> +#if !FAAN_POSTSCALE && CONFIG_FAANDCT
> #define FAAN_SCALE SCALE_PERM
> #else
> #define FAAN_SCALE NO_PERM
This ifdef looks wrong. Both sides are for the faan dct, just with
postscale on or off. Since the postscale thing is not a user-accessible
setting anyway, I suggest simplifying the code by removing it entirely.
--
Måns Rullgård
[email protected]
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
