From 27f04b405e68dfea0d6a14517a84336b7c5a56f1 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 17 Jan 2005 14:12:08 +0000 Subject: [PATCH] gst/ffmpegcolorspace/gstffmpegcodecmap.c: Fix BGRA32 caps (#164209). Original commit message from CVS: Reviewed by: Ronald S. Bultje * gst/ffmpegcolorspace/gstffmpegcodecmap.c: (gst_ffmpeg_pixfmt_to_caps): Fix BGRA32 caps (#164209). --- ChangeLog | 8 ++++++++ gst/ffmpegcolorspace/gstffmpegcodecmap.c | 14 +++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 838dad231b..5b0fd46aca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-17 Gergely Nagy + + Reviewed by: Ronald S. Bultje + + * gst/ffmpegcolorspace/gstffmpegcodecmap.c: + (gst_ffmpeg_pixfmt_to_caps): + Fix BGRA32 caps (#164209). + 2005-01-17 Gergely Nagy Reviewed by: Ronald S. Bultje diff --git a/gst/ffmpegcolorspace/gstffmpegcodecmap.c b/gst/ffmpegcolorspace/gstffmpegcodecmap.c index 3c29c7360d..0b2fbed2ab 100644 --- a/gst/ffmpegcolorspace/gstffmpegcodecmap.c +++ b/gst/ffmpegcolorspace/gstffmpegcodecmap.c @@ -196,15 +196,15 @@ gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context) depth = 32; endianness = G_BIG_ENDIAN; #if (G_BYTE_ORDER == G_BIG_ENDIAN) - r_mask = 0xff000000; - g_mask = 0x00ff0000; - b_mask = 0x0000ff00; - a_mask = 0x000000ff; -#else - r_mask = 0x000000ff; + r_mask = 0x00ff0000; g_mask = 0x0000ff00; - b_mask = 0x00ff0000; + b_mask = 0x000000ff; a_mask = 0xff000000; +#else + r_mask = 0x0000ff00; + g_mask = 0x00ff0000; + b_mask = 0xff000000; + a_mask = 0x000000ff; #endif break; case PIX_FMT_YUV410P: