mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-05 14:16:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/ffmpegcolorspace/gstffmpegcodecmap.c: Fix for depth = 15. Fixes #161675.

Browse source 
Original commit message from CVS:
Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
* gst/ffmpegcolorspace/gstffmpegcodecmap.c:
(gst_ffmpeg_caps_to_pixfmt):
Fix for depth = 15. Fixes #161675.
This commit is contained in:
Ronald S. Bultje 2005-01-15 17:58:38 +00:00
parent 5a7c2ff712
commit a1ccb24080
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-01-15 Gergely Nagy <algernon@bonehunter.rulez.org>
Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/ffmpegcolorspace/gstffmpegcodecmap.c:
(gst_ffmpeg_caps_to_pixfmt):
Fix for depth = 15. Fixes #161675.
2005-01-14 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_getcaps):

9
gst/ffmpegcolorspace/gstffmpegcodecmap.c
View file

@ -482,7 +482,7 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
}
} else if (strcmp (gst_structure_get_name (structure),
"video/x-raw-rgb") == 0) {
gint bpp = 0, rmask = 0, endianness = 0, amask = 0;
gint bpp = 0, rmask = 0, endianness = 0, amask = 0, depth = 0;
if (gst_structure_get_int (structure, "bpp", &bpp) &&
gst_structure_get_int (structure, "endianness", &endianness)) {
@ -514,8 +514,13 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
context->pix_fmt = PIX_FMT_RGB24;
break;
case 16:
if (endianness == G_BYTE_ORDER)
if (endianness == G_BYTE_ORDER) {
context->pix_fmt = PIX_FMT_RGB565;
if (gst_structure_get_int (structure, "depth", &depth)) {
if (depth == 15)
context->pix_fmt = PIX_FMT_RGB555;
}
}
break;
case 15:
if (endianness == G_BYTE_ORDER)