mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/ffmpegcolorspace/gstffmpegcodecmap.c: Fix the r_mask test for RGBA32 on little-endian.

Browse source 
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.
This commit is contained in:
Jan Schmidt 2007-07-13 15:52:02 +00:00
parent 3bac564cc0
commit b6ee0fa3d6
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2007-07-12 Wim Taymans <wim.taymans@gmail.com>
* gst/videotestsrc/videotestsrc.c: (paint_hline_AYUV), * gst/videotestsrc/videotestsrc.c: (paint_hline_AYUV),

12
gst/ffmpegcolorspace/gstffmpegcodecmap.c
View file

@ -637,7 +637,7 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
#else #else
if (rmask == 0x00ff0000) if (rmask == 0x00ff0000)
context->pix_fmt = PIX_FMT_BGRA32; context->pix_fmt = PIX_FMT_BGRA32;
else if (rmask == 0x00ff0000) else if (rmask == 0x0000ff00)
context->pix_fmt = PIX_FMT_RGBA32; context->pix_fmt = PIX_FMT_RGBA32;
else if (rmask == 0x000000ff) else if (rmask == 0x000000ff)
context->pix_fmt = PIX_FMT_ARGB32; 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 (G_BYTE_ORDER == G_BIG_ENDIAN)
if (rmask == 0x00ff0000) if (rmask == 0x00ff0000)
context->pix_fmt = PIX_FMT_RGB32; context->pix_fmt = PIX_FMT_RGB32;
elseif (rmask == 0x0000ff00) else if (rmask == 0x0000ff00)
context->pix_fmt = PIX_FMT_BGR32; context->pix_fmt = PIX_FMT_BGR32;
elseif (rmask == 0xff000000) else if (rmask == 0xff000000)
context->pix_fmt = PIX_FMT_xRGB32; context->pix_fmt = PIX_FMT_xRGB32;
else // if (rmask == 0x000000ff) else // if (rmask == 0x000000ff)
context->pix_fmt = PIX_FMT_BGRx32; context->pix_fmt = PIX_FMT_BGRx32;
#else #else
if (rmask == 0x0000ff00) if (rmask == 0x0000ff00)
context->pix_fmt = PIX_FMT_RGB32; context->pix_fmt = PIX_FMT_RGB32;