From: Antoine Cellerier <dionoea@videolan.org>
Date: Mon, 4 Jan 2010 22:05:36 +0000 (+0100)
Subject: Use %4.4s instead of %4s for fourccs cast to char *.
X-Git-Tag: 1.1.0-ff~1462
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c1848b08af53aa42cf1f26e05863a5d7a93e2500;p=vlc

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

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index fcc05ad72e..3d3448d0dc 100644
--- 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 105b69289b..9f7d36005c 100644
--- 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 2b96090152..0f9811b805 100644
--- 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 a280e14e76..c2b11c43aa 100644
--- 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 ecb330d6db..ca1c0fad57 100644
--- 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 a658c36a00..378219168d 100644
--- 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 9533179d4e..f1a1308219 100644
--- 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 5bbcfaede1..d69d92cf47 100644
--- 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 ace96636d2..b8d5681e43 100644
--- 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 735090202a..aa3c29da9e 100644
--- 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 f83ff65417..b0585dcdb2 100644
--- 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 685af6fffc..1ad5372b7c 100644
--- 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 5d875186f8..79946d989a 100644
--- 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 8249a0bf60..cf31d80638 100644
--- 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 54a8bdc4cf..eabdfcb9e2 100644
--- 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;