[vlc-commits] ASF: cosmetics

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Apr 29 16:36:37 2012 +0200| [5fe54fdef3a30eb137188cf02b61bda36ef0b9d3] | committer: Jean-Baptiste Kempf

ASF: cosmetics

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5fe54fdef3a30eb137188cf02b61bda36ef0b9d3
---

 modules/demux/asf/asf.c         |   11 +++++------
 modules/demux/asf/libasf_guid.h |    6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 608cc4f..fa50132 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -836,8 +836,8 @@ static int DemuxInit( demux_t *p_demux )
             i_format = GetWLE( &p_data[0] );
             wf_tag_to_fourcc( i_format, &fmt.i_codec, NULL );
             fmt.audio.i_channels        = GetWLE(  &p_data[2] );
-            fmt.audio.i_rate      = GetDWLE( &p_data[4] );
-            fmt.i_bitrate         = GetDWLE( &p_data[8] ) * 8;
+            fmt.audio.i_rate            = GetDWLE( &p_data[4] );
+            fmt.i_bitrate               = GetDWLE( &p_data[8] ) * 8;
             fmt.audio.i_blockalign      = GetWLE(  &p_data[12] );
             fmt.audio.i_bitspersample   = GetWLE(  &p_data[14] );
 
@@ -951,8 +951,8 @@ static int DemuxInit( demux_t *p_demux )
                 else
                     wf_tag_to_fourcc( i_format, &fmt.i_codec, NULL );
                 fmt.audio.i_channels        = GetWLE(  &p_data[2] );
-                fmt.audio.i_rate      = GetDWLE( &p_data[4] );
-                fmt.i_bitrate         = GetDWLE( &p_data[8] ) * 8;
+                fmt.audio.i_rate            = GetDWLE( &p_data[4] );
+                fmt.i_bitrate               = GetDWLE( &p_data[8] ) * 8;
                 fmt.audio.i_blockalign      = GetWLE(  &p_data[12] );
                 fmt.audio.i_bitspersample   = GetWLE(  &p_data[14] );
                 fmt.b_packetized = true;
@@ -1122,7 +1122,6 @@ error:
 static void DemuxEnd( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
-    int         i;
 
     if( p_sys->p_root )
     {
@@ -1135,7 +1134,7 @@ static void DemuxEnd( demux_t *p_demux )
         p_sys->meta = NULL;
     }
 
-    for( i = 0; i < 128; i++ )
+    for( int i = 0; i < 128; i++ )
     {
         asf_track_t *tk = p_sys->track[i];
 
diff --git a/modules/demux/asf/libasf_guid.h b/modules/demux/asf/libasf_guid.h
index 830b2e6..92e7019 100644
--- a/modules/demux/asf/libasf_guid.h
+++ b/modules/demux/asf/libasf_guid.h
@@ -97,6 +97,9 @@ static const guid_t asf_object_content_description_guid =
 static const guid_t asf_object_extended_content_description =
 {0xD2D0A440, 0xE307, 0x11D2, {0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50}};
 
+static const guid_t asf_object_padding =
+{0x1806D474, 0xCADF, 0x4509, {0xA4, 0xBA, 0x9A, 0xAB, 0xCB, 0x96, 0xAA, 0xE8}};
+
 /* Header Extension object */
 static const guid_t asf_object_advanced_mutual_exclusion =
 {0xA08649CF, 0x4775, 0x4670, {0x8A, 0x16, 0x6E, 0x35, 0x35, 0x75, 0x66, 0xCD}};
@@ -150,9 +153,6 @@ static const guid_t asf_object_extended_content_encryption_guid =
 static const guid_t asf_object_digital_signature_guid =
 {0x2211B3FC, 0xBD23, 0x11D2, {0xB4, 0xB7, 0x00, 0xA0, 0xC9, 0x55, 0xFC, 0x6E}};
 
-static const guid_t asf_object_padding =
-{0x1806D474, 0xCADF, 0x4509, {0xA4, 0xBA, 0x9A, 0xAB, 0xCB, 0x96, 0xAA, 0xE8}};
-
 // header extension
 static const guid_t asf_object_extended_stream_properties_guid =
 {0x14E6A5CB, 0xC672, 0x4332, {0x83, 0x99, 0xA9, 0x69, 0x52, 0x06, 0x5B, 0x5A}};