diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-12-17 22:38:22 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-12-17 22:38:22 +0000 |
| commit | 3dc2cc00e150b52bf6ab4ffb2c508b3f3dbc5ed2 (patch) | |
| tree | cb9eff97df435ad5b4a7701c17d112640b0caf4d | |
| parent | c1486cd0a71644878abf77039f8450450a4cdb7c (diff) | |
Fix small typo in RGB32LE red-mask checkCAPS-MERGE-3
Original commit message from CVS:
Fix small typo in RGB32LE red-mask check
| m--------- | common | 0 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegcodecmap.c | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common b/common -Subproject fcdc6ccbcc674dd487021d87a0313abf02bae39 +Subproject cd5507ae3df8dc48c07df9e37878846b6b79faa diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index e4ae451..d18e18b 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -521,7 +521,7 @@ gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, /* .. */ break; case PIX_FMT_RGBA32: - bpp = depth = 32; + bpp = 32; depth = 24; endianness = G_BIG_ENDIAN; #if (G_BYTE_ORDER == G_BIG_ENDIAN) r_mask = 0x00ff0000; g_mask = 0x0000ff00; b_mask = 0x000000ff; @@ -876,9 +876,9 @@ gst_ffmpeg_caps_to_pixfmt (GstCaps *caps, switch (bpp) { case 32: #if (G_BYTE_ORDER == G_BIG_ENDIAN) - if (rmask == 0xff0000) + if (rmask == 0x00ff0000) #else - if (rmask == 0x0000ff) + if (rmask == 0x0000ff00) #endif context->pix_fmt = PIX_FMT_RGBA32; break; |