Commit c1848b08 authored by Antoine Cellerier's avatar Antoine Cellerier

Use %4.4s instead of %4s for fourccs cast to char *.

parent 8435cb4d
...@@ -2219,7 +2219,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) ...@@ -2219,7 +2219,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
char psz_fourcc[5]; char psz_fourcc[5];
memset( &psz_fourcc, 0, sizeof( psz_fourcc ) ); memset( &psz_fourcc, 0, sizeof( psz_fourcc ) );
vlc_fourcc_to_char( p_sys->i_fourcc, &psz_fourcc ); vlc_fourcc_to_char( p_sys->i_fourcc, &psz_fourcc );
msg_Dbg( p_obj, "supported frame intervals for %4s, %dx%d:", msg_Dbg( p_obj, "supported frame intervals for %4.4s, %dx%d:",
psz_fourcc, frmival.width, frmival.height ); psz_fourcc, frmival.width, frmival.height );
switch( frmival.type ) switch( frmival.type )
{ {
...@@ -2671,7 +2671,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, ...@@ -2671,7 +2671,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
memset( &psz_fourcc, 0, sizeof( psz_fourcc ) ); memset( &psz_fourcc, 0, sizeof( psz_fourcc ) );
vlc_fourcc_to_char( v4l2chroma_to_fourcc[i].i_fourcc, vlc_fourcc_to_char( v4l2chroma_to_fourcc[i].i_fourcc,
&psz_fourcc ); &psz_fourcc );
msg_Dbg( p_obj, "device supports chroma %4s [%s, %s]", msg_Dbg( p_obj, "device supports chroma %4.4s [%s, %s]",
psz_fourcc, psz_fourcc,
p_sys->p_codecs[i_index].description, p_sys->p_codecs[i_index].description,
psz_fourcc_v4l2 ); psz_fourcc_v4l2 );
...@@ -2721,7 +2721,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, ...@@ -2721,7 +2721,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
if( !b_codec_supported ) if( !b_codec_supported )
{ {
msg_Dbg( p_obj, msg_Dbg( p_obj,
"device codec %4s (%s) not supported", "device codec %4.4s (%s) not supported",
psz_fourcc_v4l2, psz_fourcc_v4l2,
p_sys->p_codecs[i_index].description ); p_sys->p_codecs[i_index].description );
} }
......
...@@ -1972,7 +1972,7 @@ static block_t *Encode( encoder_t *p_enc, subpicture_t *p_subpic ) ...@@ -1972,7 +1972,7 @@ static block_t *Encode( encoder_t *p_enc, subpicture_t *p_subpic )
char psz_fourcc[5]; char psz_fourcc[5];
memset( &psz_fourcc, 0, sizeof( psz_fourcc ) ); memset( &psz_fourcc, 0, sizeof( psz_fourcc ) );
vlc_fourcc_to_char( p_region->fmt.i_chroma, &psz_fourcc ); vlc_fourcc_to_char( p_region->fmt.i_chroma, &psz_fourcc );
msg_Err( p_enc, "chroma %4s not supported", psz_fourcc ); msg_Err( p_enc, "chroma %4.4s not supported", psz_fourcc );
return NULL; return NULL;
} }
......
...@@ -142,7 +142,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -142,7 +142,7 @@ static int Create( vlc_object_t *p_this )
break; break;
default: default:
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) ); (char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -457,7 +457,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) ...@@ -457,7 +457,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
if( GetPackedYuvOffsets( p_pic->format.i_chroma, &i_y_offset, if( GetPackedYuvOffsets( p_pic->format.i_chroma, &i_y_offset,
&i_u_offset, &i_v_offset ) != VLC_SUCCESS ) &i_u_offset, &i_v_offset ) != VLC_SUCCESS )
{ {
msg_Warn( p_filter, "Unsupported input chroma (%4s)", msg_Warn( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_pic->format.i_chroma) ); (char*)&(p_pic->format.i_chroma) );
picture_Release( p_pic ); picture_Release( p_pic );
......
...@@ -92,7 +92,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -92,7 +92,7 @@ static int Create( vlc_object_t *p_this )
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA ) if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA )
{ {
msg_Err( p_filter, msg_Err( p_filter,
"Unsupported input chroma \"%4s\". " "Unsupported input chroma \"%4.4s\". "
"Alphamask can only use \"YUVA\".", "Alphamask can only use \"YUVA\".",
(char*)&p_filter->fmt_in.video.i_chroma ); (char*)&p_filter->fmt_in.video.i_chroma );
return VLC_EGENERIC; return VLC_EGENERIC;
......
...@@ -254,7 +254,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -254,7 +254,7 @@ static int Create( vlc_object_t *p_this )
COLORS_RGB COLORS_RGB
break; break;
default: default:
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) ); (char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -114,7 +114,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -114,7 +114,7 @@ static int Create( vlc_object_t *p_this )
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA ) if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA )
{ {
msg_Err( p_filter, msg_Err( p_filter,
"Unsupported input chroma \"%4s\". " "Unsupported input chroma \"%4.4s\". "
"Bluescreen can only use \"YUVA\".", "Bluescreen can only use \"YUVA\".",
(char*)&p_filter->fmt_in.video.i_chroma ); (char*)&p_filter->fmt_in.video.i_chroma );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -179,7 +179,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -179,7 +179,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
if( p_pic->format.i_chroma != VLC_CODEC_YUVA ) if( p_pic->format.i_chroma != VLC_CODEC_YUVA )
{ {
msg_Err( p_filter, msg_Err( p_filter,
"Unsupported input chroma \"%4s\". " "Unsupported input chroma \"%4.4s\". "
"Bluescreen can only use \"YUVA\".", "Bluescreen can only use \"YUVA\".",
(char*)&p_pic->format.i_chroma ); (char*)&p_pic->format.i_chroma );
return NULL; return NULL;
......
...@@ -119,7 +119,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -119,7 +119,7 @@ static int Create( vlc_object_t *p_this )
break; break;
default: default:
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) ); (char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -142,7 +142,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -142,7 +142,7 @@ static int Create( vlc_object_t *p_this )
break; break;
default: default:
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) ); (char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -118,7 +118,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -118,7 +118,7 @@ static int Create( vlc_object_t *p_this )
default: default:
/* We only want planar YUV 4:2:0 or 4:2:2 */ /* We only want planar YUV 4:2:0 or 4:2:2 */
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) ); (char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -242,7 +242,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -242,7 +242,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
default: default:
vlc_mutex_unlock( &p_sys->lock ); vlc_mutex_unlock( &p_sys->lock );
msg_Warn( p_filter, "Unsupported input chroma (%4s)", msg_Warn( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_pic->format.i_chroma) ); (char*)&(p_pic->format.i_chroma) );
picture_Release( p_pic ); picture_Release( p_pic );
return NULL; return NULL;
......
...@@ -135,7 +135,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -135,7 +135,7 @@ static int Create( vlc_object_t *p_this )
) )
{ {
/* We only want planar YUV 4:2:0 or 4:2:2 */ /* We only want planar YUV 4:2:0 or 4:2:2 */
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) ); (char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -141,7 +141,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -141,7 +141,7 @@ static int Create( vlc_object_t *p_this )
break; break;
default: default:
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) ); (char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -75,7 +75,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -75,7 +75,7 @@ static int Create( vlc_object_t *p_this )
break; break;
default: default:
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) ); (char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -103,7 +103,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -103,7 +103,7 @@ static int Create( vlc_object_t *p_this )
break; break;
default: default:
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_fmt->i_chroma) ); (char*)&(p_fmt->i_chroma) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -291,7 +291,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_inpic ) ...@@ -291,7 +291,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_inpic )
if( GetPackedYuvOffsets( p_fmt->i_chroma, if( GetPackedYuvOffsets( p_fmt->i_chroma,
&i_y_offset, &i_u_offset, &i_v_offset ) ) &i_y_offset, &i_u_offset, &i_v_offset ) )
{ {
msg_Warn( p_filter, "Unsupported input chroma (%4s)", msg_Warn( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&p_fmt->i_chroma ); (char*)&p_fmt->i_chroma );
return p_inpic; return p_inpic;
} }
......
...@@ -168,7 +168,7 @@ static int OpenPostproc( vlc_object_t *p_this ) ...@@ -168,7 +168,7 @@ static int OpenPostproc( vlc_object_t *p_this )
i_flags |= PP_FORMAT_420; i_flags |= PP_FORMAT_420;
break; break;
default: default:
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&p_filter->fmt_in.video.i_chroma ); (char*)&p_filter->fmt_in.video.i_chroma );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -122,7 +122,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -122,7 +122,7 @@ static int Create( vlc_object_t *p_this )
break; break;
default: default:
msg_Err( p_filter, "Unsupported input chroma (%4s)", msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) ); (char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -302,7 +302,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) ...@@ -302,7 +302,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
if( GetPackedYuvOffsets( p_pic->format.i_chroma, &i_y_offset, if( GetPackedYuvOffsets( p_pic->format.i_chroma, &i_y_offset,
&i_u_offset, &i_v_offset ) != VLC_SUCCESS ) &i_u_offset, &i_v_offset ) != VLC_SUCCESS )
{ {
msg_Warn( p_filter, "Unsupported input chroma (%4s)", msg_Warn( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_pic->format.i_chroma) ); (char*)&(p_pic->format.i_chroma) );
picture_Release( p_pic ); picture_Release( p_pic );
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment