More coding style changes.

diff --git a/modules/access/sdi.cpp b/modules/access/sdi.cpp
index 8ea8eeab8e9829e244d89e4b82822e25d40341c2..e867f534ed5d6b8f4c47d0872abd276f1a4583b1 100644 (file)
--- a/modules/access/sdi.cpp
+++ b/modules/access/sdi.cpp
@@ -341,21 +341,21 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
     
-    char *mode_string = var_CreateGetString( p_demux, "sdi-mode" );
-    if( !mode_string || strlen( mode_string ) == 0 || strlen( mode_string ) > 4 ) {
+    char *psz_display_mode = var_CreateGetString( p_demux, "sdi-mode" );
+    if( !psz_display_mode || strlen( psz_display_mode ) == 0 || strlen( psz_display_mode ) > 4 ) {
         msg_Err( p_demux, "Missing or invalid --sdi-mode string" );
         return VLC_EGENERIC;
     }
 
     // Pad the --sdi-mode string to four characters, so the user can specify e.g. "pal"
     // without having to add the trailing space.
-    char mode_string_padded[5];
-    strcpy(mode_string_padded, "    ");
-    for( int i = 0; i < strlen(mode_string); ++i )
-        mode_string_padded[i] = mode_string[i];
+    char sz_display_mode_padded[5];
+    strcpy(sz_display_mode_padded, "    ");
+    for( int i = 0; i < strlen( psz_display_mode ); ++i )
+        sz_display_mode_padded[i] = psz_display_mode[i];
 
     BMDDisplayMode wanted_mode_id;
-    memcpy( &wanted_mode_id, &mode_string_padded, sizeof(wanted_mode_id) );
+    memcpy( &wanted_mode_id, &sz_display_mode_padded, sizeof(wanted_mode_id) );
     
     bool b_found_mode = false;
 
@@ -368,12 +368,12 @@ static int Open( vlc_object_t *p_this )
             break; 
         }
 
-        char mode_id_text[5] = {0};
+        char sz_mode_id_text[5] = {0};
         BMDDisplayMode mode_id = ntohl( p_display_mode->GetDisplayMode() );
-        memcpy( mode_id_text, &mode_id, sizeof(mode_id) );
+        memcpy( sz_mode_id_text, &mode_id, sizeof(mode_id) );
 
-        const char *mode_name;
-        result = p_display_mode->GetName( &mode_name );
+        const char *psz_mode_name;
+        result = p_display_mode->GetName( &psz_mode_name );
         if( result != S_OK )
         {
             msg_Err( p_demux, "Failed to get display mode name" );
@@ -388,34 +388,34 @@ static int Open( vlc_object_t *p_this )
             return VLC_EGENERIC;
         }
 
-        const char *field_dominance;
+        const char *psz_field_dominance;
         uint32_t i_dominance_flags = 0;
         switch( p_display_mode->GetFieldDominance() )
         {
         case bmdProgressiveFrame:
-            field_dominance = "";
+            psz_field_dominance = "";
             break;
         case bmdProgressiveSegmentedFrame:
-            field_dominance = ", segmented";
+            psz_field_dominance = ", segmented";
             break;
         case bmdLowerFieldFirst:
-            field_dominance = ", interlaced [BFF]";
+            psz_field_dominance = ", interlaced [BFF]";
             i_dominance_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
             break;
         case bmdUpperFieldFirst:
-            field_dominance = ", interlaced [TFF]";
+            psz_field_dominance = ", interlaced [TFF]";
             i_dominance_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
             break;
         case bmdUnknownFieldDominance:
         default:
-            field_dominance = ", unknown field dominance";
+            psz_field_dominance = ", unknown field dominance";
             break;
         }
 
         msg_Dbg( p_demux, "Found mode '%s': %s (%dx%d, %.3f fps%s)",
-                 mode_id_text, mode_name,
+                 sz_mode_id_text, psz_mode_name,
                  p_display_mode->GetWidth(), p_display_mode->GetHeight(),
-                 double(time_scale) / frame_duration, field_dominance );
+                 double(time_scale) / frame_duration, psz_field_dominance );
 
         if( wanted_mode_id == mode_id )
         {