diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2007-07-13 15:52:02 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2007-07-13 15:52:02 +0000 |
| commit | b6ee0fa3d62b1343e075b13e69ebe72c482ec145 (patch) | |
| tree | 600bf773213d9b456a1817d3e2d7b72fe67f9dcc | |
| parent | 3bac564cc0fb912e1b426f2774f6ff86edb76dac (diff) | |
gst/ffmpegcolorspace/gstffmpegcodecmap.c: Fix the r_mask test for RGBA32 on little-endian.
Original commit message from CVS:
* gst/ffmpegcolorspace/gstffmpegcodecmap.c:
(gst_ffmpeg_caps_to_pixfmt):
Fix the r_mask test for RGBA32 on little-endian.
Fix a stupid typo that would have obviously broken
compilation on big-endian, if anyone was testing.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/ffmpegcolorspace/gstffmpegcodecmap.c | 12 |
2 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2007-07-13 Jan Schmidt <thaytan@mad.scientist.com> + + * gst/ffmpegcolorspace/gstffmpegcodecmap.c: + (gst_ffmpeg_caps_to_pixfmt): + Fix the r_mask test for RGBA32 on little-endian. + Fix a stupid typo that would have obviously broken + compilation on big-endian, if anyone was testing. + 2007-07-12 Wim Taymans <wim.taymans@gmail.com> * gst/videotestsrc/videotestsrc.c: (paint_hline_AYUV), diff --git a/gst/ffmpegcolorspace/gstffmpegcodecmap.c b/gst/ffmpegcolorspace/gstffmpegcodecmap.c index bb46375c..96e1a640 100644 --- a/gst/ffmpegcolorspace/gstffmpegcodecmap.c +++ b/gst/ffmpegcolorspace/gstffmpegcodecmap.c @@ -637,7 +637,7 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps, #else if (rmask == 0x00ff0000) context->pix_fmt = PIX_FMT_BGRA32; - else if (rmask == 0x00ff0000) + else if (rmask == 0x0000ff00) context->pix_fmt = PIX_FMT_RGBA32; else if (rmask == 0x000000ff) context->pix_fmt = PIX_FMT_ARGB32; @@ -648,12 +648,12 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps, #if (G_BYTE_ORDER == G_BIG_ENDIAN) if (rmask == 0x00ff0000) context->pix_fmt = PIX_FMT_RGB32; - elseif (rmask == 0x0000ff00) - context->pix_fmt = PIX_FMT_BGR32; - elseif (rmask == 0xff000000) - context->pix_fmt = PIX_FMT_xRGB32; + else if (rmask == 0x0000ff00) + context->pix_fmt = PIX_FMT_BGR32; + else if (rmask == 0xff000000) + context->pix_fmt = PIX_FMT_xRGB32; else // if (rmask == 0x000000ff) - context->pix_fmt = PIX_FMT_BGRx32; + context->pix_fmt = PIX_FMT_BGRx32; #else if (rmask == 0x0000ff00) context->pix_fmt = PIX_FMT_RGB32; |