From c9f5fcd08c3a33bfb1b473705c792ab051e7428d Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Tue, 26 Mar 2013 17:09:05 +0200
Subject: [PATCH] dsputil: Merge 9-10 bpp functions for get_pixels and
draw_edge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
These only care about pixel storage unit size, not actual bits
used (i.e. they don't clip).
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavcodec/dsputil.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 696d16b59ef..9d0303e0905 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -43,11 +43,7 @@
uint32_t ff_squareTbl[512] = {0, };
-#define BIT_DEPTH 9
-#include "dsputil_template.c"
-#undef BIT_DEPTH
-
-#define BIT_DEPTH 10
+#define BIT_DEPTH 16
#include "dsputil_template.c"
#undef BIT_DEPTH
@@ -2737,10 +2733,8 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
switch (avctx->bits_per_raw_sample) {
case 9:
- BIT_DEPTH_FUNCS(9);
- break;
case 10:
- BIT_DEPTH_FUNCS(10);
+ BIT_DEPTH_FUNCS(16);
break;
default:
BIT_DEPTH_FUNCS(8);
--
GitLab