[vlc-devel] [PATCH 4/7] demux/ogg: Follow coding style for ogg dirac functions

[davidf+nntp at woaf.net]

From: David Flynn <davidf at woaf.net>


Signed-off-by: David Flynn <davidf at rd.bbc.co.uk>
---
 modules/demux/ogg.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 9070acc..2f90464 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -1790,7 +1790,7 @@ static void Ogg_ReadDiracHeader( logical_stream_t *p_stream,
 
     /* read in useful bits from sequence header */
     bs_init( &bs, p_oggpacket->packet, p_oggpacket->bytes );
-    bs_skip( &bs, 13*8); /* parse_info_header */
+    bs_skip( &bs, 13*8 ); /* parse_info_header */
     dirac_uint( &bs ); /* major_version */
     dirac_uint( &bs ); /* minor_version */
     dirac_uint( &bs ); /* profile */
@@ -1814,8 +1814,9 @@ static void Ogg_ReadDiracHeader( logical_stream_t *p_stream,
         dirac_uint( &bs ); /* scan_format */
     }
 
-    static const struct {
-        uint32_t u_n /* numerator */, u_d /* denominator */;
+    const struct {
+        uint32_t u_n /* numerator */;
+        uint32_t u_d /* denominator */;
     } p_dirac_frate_tbl[] = { /* table 10.3 */
         {1,1}, /* this first value is never used */
         {24000,1001}, {24,1}, {25,1}, {30000,1001}, {30,1},
@@ -1823,7 +1824,7 @@ static void Ogg_ReadDiracHeader( logical_stream_t *p_stream,
     };
     static const size_t u_dirac_frate_tbl = sizeof(p_dirac_frate_tbl)/sizeof(*p_dirac_frate_tbl);
 
-    static const uint32_t pu_dirac_vidfmt_frate[] = { /* table C.1 */
+    const uint32_t pu_dirac_vidfmt_frate[] = { /* table C.1 */
         1, 9, 10, 9, 10, 9, 10, 4, 3, 7, 6, 4, 3, 7, 6, 2, 2, 7, 6, 7, 6,
     };
     static const size_t u_dirac_vidfmt_frate = sizeof(pu_dirac_vidfmt_frate)/sizeof(*pu_dirac_vidfmt_frate);
-- 
1.5.6.5