diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-01 15:25:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 15:25:04 +0200 |
| commit | 45c24f05d023a2cd8289ed40a13708392ce2e6a4 (patch) | |
| tree | fef75d382fc6216a093eeaf80560473dff19d883 /media/ffvpx/libavcodec/bit_depth_template.c | |
| parent | 79b00fc33b5cb6d56d29b50efac6d62ce3a89018 (diff) | |
| download | UXP-45c24f05d023a2cd8289ed40a13708392ce2e6a4.tar UXP-45c24f05d023a2cd8289ed40a13708392ce2e6a4.tar.gz UXP-45c24f05d023a2cd8289ed40a13708392ce2e6a4.tar.lz UXP-45c24f05d023a2cd8289ed40a13708392ce2e6a4.tar.xz UXP-45c24f05d023a2cd8289ed40a13708392ce2e6a4.zip | |
Revert "Update ffvpx code to 4.0.2"
Diffstat (limited to 'media/ffvpx/libavcodec/bit_depth_template.c')
| -rw-r--r-- | media/ffvpx/libavcodec/bit_depth_template.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/media/ffvpx/libavcodec/bit_depth_template.c b/media/ffvpx/libavcodec/bit_depth_template.c index d44d47ea4..80184892f 100644 --- a/media/ffvpx/libavcodec/bit_depth_template.c +++ b/media/ffvpx/libavcodec/bit_depth_template.c @@ -29,7 +29,6 @@ # undef pixel2 # undef pixel4 # undef dctcoef -# undef idctin # undef INIT_CLIP # undef no_rnd_avg_pixel4 # undef rnd_avg_pixel4 @@ -54,16 +53,6 @@ # define pixel4 uint64_t # define dctcoef int32_t -#ifdef IN_IDCT_DEPTH -#if IN_IDCT_DEPTH == 32 -# define idctin int32_t -#else -# define idctin int16_t -#endif -#else -# define idctin int16_t -#endif - # define INIT_CLIP # define no_rnd_avg_pixel4 no_rnd_avg64 # define rnd_avg_pixel4 rnd_avg64 @@ -82,7 +71,6 @@ # define pixel2 uint16_t # define pixel4 uint32_t # define dctcoef int16_t -# define idctin int16_t # define INIT_CLIP # define no_rnd_avg_pixel4 no_rnd_avg32 @@ -99,10 +87,7 @@ # define CLIP(a) av_clip_uint8(a) #endif -#define FUNC3(a, b, c) a ## _ ## b ## c +#define FUNC3(a, b, c) a ## _ ## b ## c #define FUNC2(a, b, c) FUNC3(a, b, c) #define FUNC(a) FUNC2(a, BIT_DEPTH,) #define FUNCC(a) FUNC2(a, BIT_DEPTH, _c) -#define FUNC4(a, b, c) a ## _int ## b ## _ ## c ## bit -#define FUNC5(a, b, c) FUNC4(a, b, c) -#define FUNC6(a) FUNC5(a, IN_IDCT_DEPTH, BIT_DEPTH) |