From 8245520b88002908129207c15fbe8b5c6680a76e Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 8 May 2013 18:52:36 +0000 Subject: lavfi/colorchannelmixer: remove now redudant code Signed-off-by: Paul B Mahol --- libavfilter/vf_colorchannelmixer.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'libavfilter/vf_colorchannelmixer.c') diff --git a/libavfilter/vf_colorchannelmixer.c b/libavfilter/vf_colorchannelmixer.c index dd87236bba..343faace49 100644 --- a/libavfilter/vf_colorchannelmixer.c +++ b/libavfilter/vf_colorchannelmixer.c @@ -91,27 +91,16 @@ static int config_output(AVFilterLink *outlink) ColorChannelMixerContext *cm = ctx->priv; int i, j, size, *buffer; + ff_fill_rgba_map(cm->rgba_map, outlink->format); + switch (outlink->format) { case AV_PIX_FMT_RGB48: case AV_PIX_FMT_BGR48: case AV_PIX_FMT_RGBA64: case AV_PIX_FMT_BGRA64: - if (outlink->format == AV_PIX_FMT_RGB48 || - outlink->format == AV_PIX_FMT_RGBA64) { - cm->rgba_map[R] = 0; - cm->rgba_map[G] = 1; - cm->rgba_map[B] = 2; - cm->rgba_map[A] = 3; - } else { - cm->rgba_map[R] = 2; - cm->rgba_map[G] = 1; - cm->rgba_map[B] = 0; - cm->rgba_map[A] = 3; - } size = 65536; break; default: - ff_fill_rgba_map(cm->rgba_map, outlink->format); size = 256; } -- cgit v1.2.3