videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00
Code Releases Activity

XCB-XV: do not clobber video chroma is port grabbing fails

Browse Source
This commit is contained in:
Rémi Denis-Courmont 2009-10-19 20:22:30 +03:00
parent a74e5b0434
commit 8b65aa8a59
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/video_output/xcb/xvideo.c
View File

@ -356,9 +356,8 @@ static int Open (vlc_object_t *obj)
if (r == NULL)
continue;
const xcb_xv_image_format_info_t *xfmt;
/* */
/* Look for an image format */
const xcb_xv_image_format_info_t *xfmt = NULL;
const vlc_fourcc_t *chromas, chromas_default[] = {
fmt.i_chroma,
VLC_CODEC_RGB32,
@ -373,20 +372,19 @@ static int Open (vlc_object_t *obj)
else
chromas = chromas_default;
for (size_t i = 0; chromas[i]; i++)
vlc_fourcc_t chroma;
for (size_t i = 0; chromas[i] && (xfmt == NULL); i++)
{
vlc_fourcc_t chroma = chromas[i];
chroma = chromas[i];
xfmt = FindFormat (vd, chroma, &fmt, a->base_id, r, &p_sys->att);
if (xfmt != NULL)
{
fmt.i_chroma = chroma;
goto found_format;
}
}
free (r);
continue;
found_format:
if (xfmt == NULL) /* No acceptable image formats */
{
free (r);
continue;
}
/* Grab a port */
for (unsigned i = 0; i < a->num_ports; i++)
{
@ -417,6 +415,7 @@ static int Open (vlc_object_t *obj)
p_sys->id = xfmt->id;
msg_Dbg (vd, "using image format 0x%"PRIx32, p_sys->id);
fmt.i_chroma = chroma;
if (xfmt->type == XCB_XV_IMAGE_FORMAT_INFO_TYPE_RGB)
{
fmt.i_rmask = xfmt->red_mask;