[FFmpeg-cvslog] lavfi/colorchannelmixer: remove now redudant code
Paul B Mahol
git at videolan.org
Wed May 8 21:38:12 CEST 2013
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed May 8 18:52:36 2013 +0000| [8245520b88002908129207c15fbe8b5c6680a76e] | committer: Paul B Mahol
lavfi/colorchannelmixer: remove now redudant code
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8245520b88002908129207c15fbe8b5c6680a76e
---
libavfilter/vf_colorchannelmixer.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/libavfilter/vf_colorchannelmixer.c b/libavfilter/vf_colorchannelmixer.c
index dd87236..343faac 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;
}
More information about the ffmpeg-cvslog
mailing list