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

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index fcc05ad72e3a4caefb8cc7c5dd516d9c3c2d57a7..3d3448d0dc0fdf33681ac0a4b275de0f5326cd30 100644 (file)
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -2219,7 +2219,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
         char psz_fourcc[5];
         memset( &psz_fourcc, 0, sizeof( 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 );
         switch( frmival.type )
         {
@@ -2671,7 +2671,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
                     memset( &psz_fourcc, 0, sizeof( psz_fourcc ) );
                     vlc_fourcc_to_char( v4l2chroma_to_fourcc[i].i_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,
                                 p_sys->p_codecs[i_index].description,
                                 psz_fourcc_v4l2 );
@@ -2721,7 +2721,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
             if( !b_codec_supported )
             {
                     msg_Dbg( p_obj,
-                         "device codec %4s (%s) not supported",
+                         "device codec %4.4s (%s) not supported",
                          psz_fourcc_v4l2,
                          p_sys->p_codecs[i_index].description );
             }

diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index 105b69289ba81121e56e8a2807b2669b89404db0..9f7d36005cb1a280746c44d6760269119bc98ee2 100644 (file)
--- a/modules/codec/dvbsub.c
+++ b/modules/codec/dvbsub.c
@@ -1972,7 +1972,7 @@ static block_t *Encode( encoder_t *p_enc, subpicture_t *p_subpic )
         char psz_fourcc[5];
         memset( &psz_fourcc, 0, sizeof( 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;
     }
 

diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c
index 2b9609015233f32cc2d9d20f14aecdfa2c56ba44..0f9811b805cb1cb8040e75fee81fbc21e6528a03 100644 (file)
--- a/modules/video_filter/adjust.c
+++ b/modules/video_filter/adjust.c
@@ -142,7 +142,7 @@ static int Create( vlc_object_t *p_this )
             break;
 
         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) );
             return VLC_EGENERIC;
     }
@@ -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,
                              &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) );
 
         picture_Release( p_pic );

diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index a280e14e7682cfd8b83a712e0e34f38cdad38807..c2b11c43aa1e3f4ca5d7642bc52e7df0a15662d6 100644 (file)
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -92,7 +92,7 @@ static int Create( vlc_object_t *p_this )
     if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA )
     {
         msg_Err( p_filter,
-                 "Unsupported input chroma \"%4s\". "
+                 "Unsupported input chroma \"%4.4s\". "
                  "Alphamask can only use \"YUVA\".",
                  (char*)&p_filter->fmt_in.video.i_chroma );
         return VLC_EGENERIC;

diff --git a/modules/video_filter/ball.c b/modules/video_filter/ball.c
index ecb330d6dbe157fd9fc2a78d380d6402c92ba556..ca1c0fad57a2f2f83d892130b754265d018e821b 100644 (file)
--- a/modules/video_filter/ball.c
+++ b/modules/video_filter/ball.c
@@ -254,7 +254,7 @@ static int Create( vlc_object_t *p_this )
             COLORS_RGB
             break;
         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) );
             return VLC_EGENERIC;
     }

diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c
index a658c36a00b797642f8666c82614ca70dda108ed..378219168dc021cd2f2df4da2998fe332f0e7e74 100644 (file)
--- a/modules/video_filter/bluescreen.c
+++ b/modules/video_filter/bluescreen.c
@@ -114,7 +114,7 @@ static int Create( vlc_object_t *p_this )
     if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA )
     {
         msg_Err( p_filter,
-                 "Unsupported input chroma \"%4s\". "
+                 "Unsupported input chroma \"%4.4s\". "
                  "Bluescreen can only use \"YUVA\".",
                  (char*)&p_filter->fmt_in.video.i_chroma );
         return VLC_EGENERIC;
@@ -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 )
     {
         msg_Err( p_filter,
-                 "Unsupported input chroma \"%4s\". "
+                 "Unsupported input chroma \"%4.4s\". "
                  "Bluescreen can only use \"YUVA\".",
                  (char*)&p_pic->format.i_chroma );
         return NULL;

diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index 9533179d4e48ae93d5c81c5c613a7621d7807fcb..f1a13082194fbca71b8e5705ab61828a49a2956c 100644 (file)
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -119,7 +119,7 @@ static int Create( vlc_object_t *p_this )
             break;
 
         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) );
             return VLC_EGENERIC;
     }

diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c
index 5bbcfaede1434752c9585e753ca4c6e18ab4cffd..d69d92cf47f749170d11d1e0c623ba0992be3656 100644 (file)
--- a/modules/video_filter/erase.c
+++ b/modules/video_filter/erase.c
@@ -142,7 +142,7 @@ static int Create( vlc_object_t *p_this )
             break;
 
         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) );
             return VLC_EGENERIC;
     }

diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c
index ace96636d2b712bc50f0aee472cef16da23c1954..b8d5681e43c06978558f2e3bf8c202a4ced1aa08 100644 (file)
--- a/modules/video_filter/extract.c
+++ b/modules/video_filter/extract.c
@@ -118,7 +118,7 @@ static int Create( vlc_object_t *p_this )
 
         default:
             /* 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) );
             return VLC_EGENERIC;
     }
@@ -242,7 +242,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
         default:
             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) );
             picture_Release( p_pic );
             return NULL;

diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c
index 735090202a8ef91696854db780c5e247d1d80ccf..aa3c29da9e41a3e38e8300702d77dba15d596a41 100644 (file)
--- a/modules/video_filter/gaussianblur.c
+++ b/modules/video_filter/gaussianblur.c
@@ -135,7 +135,7 @@ static int Create( vlc_object_t *p_this )
       )
     {
         /* 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) );
         return VLC_EGENERIC;
     }

diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c
index f83ff6541706acf7f47e49f4c3a10750cd447e79..b0585dcdb2a39a5b81f2fe29b116ce55787c8d4b 100644 (file)
--- a/modules/video_filter/gradient.c
+++ b/modules/video_filter/gradient.c
@@ -141,7 +141,7 @@ static int Create( vlc_object_t *p_this )
             break;
 
         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) );
             return VLC_EGENERIC;
     }

diff --git a/modules/video_filter/grain.c b/modules/video_filter/grain.c
index 685af6fffcc73a7a03293371b0463a722e77a081..1ad5372b7c532bdb907c1c208fef9111c99191bd 100644 (file)
--- a/modules/video_filter/grain.c
+++ b/modules/video_filter/grain.c
@@ -75,7 +75,7 @@ static int Create( vlc_object_t *p_this )
             break;
 
         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) );
             return VLC_EGENERIC;
     }

diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index 5d875186f8819da69617f0e3383a66f5d11a7855..79946d989a678581cd66c165711ecf47bbd9b8fb 100644 (file)
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -103,7 +103,7 @@ static int Create( vlc_object_t *p_this )
             break;
 
         default:
-            msg_Err( p_filter, "Unsupported input chroma (%4s)",
+            msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
                      (char*)&(p_fmt->i_chroma) );
             return VLC_EGENERIC;
     }
@@ -291,7 +291,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_inpic )
     if( GetPackedYuvOffsets( p_fmt->i_chroma,
                              &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 );
         return p_inpic;
     }

diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index 8249a0bf6080a10206d443fafa9599fc83cd4c06..cf31d806381064a409158001d1cfa53ef156b084 100644 (file)
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -168,7 +168,7 @@ static int OpenPostproc( vlc_object_t *p_this )
             i_flags |= PP_FORMAT_420;
             break;
         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 );
             return VLC_EGENERIC;
     }

diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c
index 54a8bdc4cffa658112454360a17aaa10b2bd3e67..eabdfcb9e2a75da1aab108b463ec01006d1f434b 100644 (file)
--- a/modules/video_filter/rotate.c
+++ b/modules/video_filter/rotate.c
@@ -122,7 +122,7 @@ static int Create( vlc_object_t *p_this )
             break;
 
         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) );
             return VLC_EGENERIC;
     }
@@ -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,
                              &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) );
         picture_Release( p_pic );
         return NULL;