aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-03-26 17:09:05 +0200
committerMartin Storsjö <martin@martin.st>2013-04-19 23:29:22 +0300
commitc9f5fcd08c3a33bfb1b473705c792ab051e7428d (patch)
treed92597576e115c05b47b8f7d3deea94ab285a378
parent619e0da19119bcd683f135fe9a164f37c0ca70d1 (diff)
downloadffmpeg-c9f5fcd08c3a33bfb1b473705c792ab051e7428d.tar.gz
dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge
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>
-rw-r--r--libavcodec/dsputil.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 696d16b59e..9d0303e090 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);