From e5ffffe48d20642acc079166f0fa7d93a6a9f594 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 11 Feb 2013 13:52:38 -0800 Subject: h264chroma: Remove duplicate 9/10 bit functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These functions do the same thing in 16 bit space and don't need any depth specific clipping. Signed-off-by: Martin Storsjö --- libavcodec/h264chroma.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'libavcodec/h264chroma.c') diff --git a/libavcodec/h264chroma.c b/libavcodec/h264chroma.c index 2bd2df3b56..463d6c454f 100644 --- a/libavcodec/h264chroma.c +++ b/libavcodec/h264chroma.c @@ -23,11 +23,7 @@ #include "h264chroma_template.c" #undef BIT_DEPTH -#define BIT_DEPTH 9 -#include "h264chroma_template.c" -#undef BIT_DEPTH - -#define BIT_DEPTH 10 +#define BIT_DEPTH 16 #include "h264chroma_template.c" #undef BIT_DEPTH @@ -41,16 +37,10 @@ void ff_h264chroma_init(H264ChromaContext *c, int bit_depth) { - switch (bit_depth) { - case 10: - SET_CHROMA(10); - break; - case 9: - SET_CHROMA(9); - break; - default: + if (bit_depth > 8 && bit_depth <= 16) { + SET_CHROMA(16); + } else { SET_CHROMA(8); - break; } if (ARCH_ARM) -- cgit v1.2.3