[vlc-commits] Ogg: clean header and remove unused members

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan 14 11:37:49 2013 +0100| [4de7c37a4f7fc5989e0fde94e085504cc7fc6705] | committer: Jean-Baptiste Kempf

Ogg: clean header and remove unused members

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

 modules/demux/ogg.h |   25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/modules/demux/ogg.h b/modules/demux/ogg.h
index a77809e..3a57c11 100644
--- a/modules/demux/ogg.h
+++ b/modules/demux/ogg.h
@@ -23,20 +23,11 @@
  *****************************************************************************/
 
 /*****************************************************************************
- * Preamble
+ * Definitions of structures and functions used by this plugin
  *****************************************************************************/
 
-
-
-
-/*****************************************************************************
- * Definitions of structures and functions used by this plugins
- *****************************************************************************/
-
-
 typedef struct oggseek_index_entry demux_index_entry_t;
 
-
 typedef struct logical_stream_s
 {
     ogg_stream_state os;                        /* logical stream of packets */
@@ -66,6 +57,7 @@ typedef struct logical_stream_s
     /* Misc */
     bool b_reinit;
     int i_granule_shift;
+
     /* Opus has a starting offset in the headers. */
     int i_pre_skip;
     /* Vorbis and Opus can trim the end of a stream using granule positions. */
@@ -91,11 +83,6 @@ typedef struct logical_stream_s
 
 } logical_stream_t;
 
-
-
-
-
-
 struct demux_sys_t
 {
     ogg_sync_state oy;        /* sync and verify incoming physical bitstream */
@@ -131,16 +118,14 @@ struct demux_sys_t
     /* current page being parsed */
     ogg_page current_page;
 
-    mtime_t i_st_pts;
-
     /* */
-    vlc_meta_t *p_meta;
+    vlc_meta_t          *p_meta;
     int                 i_seekpoints;
     seekpoint_t         **pp_seekpoints;
 
     /* */
-    int                i_attachments;
-    input_attachment_t **attachments;
+    int                 i_attachments;
+    input_attachment_t  **attachments;
 
     /* Length, if available. */
     int64_t i_length;