Drop weird and unnecessary _s/_st suffixes from demuxer struct names.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30686 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 20 insertions, 20 deletions

diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c
index a252c8c984..704c31e4b1 100644
--- a/libmpdemux/demux_nemesi.c
+++ b/libmpdemux/demux_nemesi.c
@@ -455,7 +455,7 @@ static void demux_seek_rtp(demuxer_t *demuxer, float rel_seek_secs,
         mp_msg(MSGT_DEMUX, MSGL_ERR, "Unsupported seek type\n");
 }
 
-static int demux_rtp_control(struct demuxer_st *demuxer, int cmd, void *arg)
+static int demux_rtp_control(struct demuxer *demuxer, int cmd, void *arg)
 {
     Nemesi_DemuxerStreamData * ndsd = demuxer->priv;
     rtsp_ctrl * ctl = ndsd->rtsp;
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index 43d38806f0..52af89b0ee 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -666,7 +666,7 @@ demux_packet_t* ReadBufferQueue::getPendingBuffer() {
   return dp;
 }
 
-static int demux_rtp_control(struct demuxer_st *demuxer, int cmd, void *arg) {
+static int demux_rtp_control(struct demuxer *demuxer, int cmd, void *arg) {
   double endpts = ((RTPState*)demuxer->priv)->mediaSession->playEndTime();
 
   switch(cmd) {
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 86d36d95ee..9935a4a896 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -193,7 +193,7 @@ void free_demuxer_stream(demux_stream_t *ds)
     free(ds);
 }
 
-demux_stream_t *new_demuxer_stream(struct demuxer_st *demuxer, int id)
+demux_stream_t *new_demuxer_stream(struct demuxer *demuxer, int id)
 {
     demux_stream_t *ds = malloc(sizeof(demux_stream_t));
     *ds = (demux_stream_t){
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 09da39713d..699e5a56b9 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -118,7 +118,7 @@
 #define MP_INPUT_BUFFER_PADDING_SIZE 8
 
 // Holds one packet/frame/whatever
-typedef struct demux_packet_st {
+typedef struct demux_packet {
   int len;
   double pts;
   double endpts;
@@ -127,8 +127,8 @@ typedef struct demux_packet_st {
   unsigned char* buffer;
   int flags; // keyframe, etc
   int refcount;   //refcounter for the master packet, if 0, buffer can be free()d
-  struct demux_packet_st* master; //pointer to the master packet if this one is a cloned one
-  struct demux_packet_st* next;
+  struct demux_packet* master; //pointer to the master packet if this one is a cloned one
+  struct demux_packet* next;
 } demux_packet_t;
 
 typedef struct {
@@ -151,7 +151,7 @@ typedef struct {
   demux_packet_t *last;   // append new packets from input stream to here
   demux_packet_t *current;// needed for refcounting of the buffer
   int id;                 // stream ID  (for multiple audio/video streams)
-  struct demuxer_st *demuxer; // parent demuxer structure (stream handler)
+  struct demuxer *demuxer; // parent demuxer structure (stream handler)
 // ---- asf -----
   demux_packet_t *asf_packet;  // read asf fragments here
   int asf_seq;
@@ -161,7 +161,7 @@ typedef struct {
   void* sh;
 } demux_stream_t;
 
-typedef struct demuxer_info_st {
+typedef struct demuxer_info {
   char *name;
   char *author;
   char *encoder;
@@ -173,7 +173,7 @@ typedef struct demuxer_info_st {
 #define MAX_V_STREAMS 256
 #define MAX_S_STREAMS 256
 
-struct demuxer_st;
+struct demuxer;
 
 extern int correct_pts;
 extern int user_correct_pts;
@@ -181,7 +181,7 @@ extern int user_correct_pts;
 /**
  * Demuxer description structure
  */
-typedef struct demuxers_desc_st {
+typedef struct demuxer_desc {
   const char *info; ///< What is it (long name and/or description)
   const char *name; ///< Demuxer name, used with -demuxer switch
   const char *shortdesc; ///< Description printed at demuxer detection
@@ -192,26 +192,26 @@ typedef struct demuxers_desc_st {
   int safe_check; ///< If 1 detection is safe and fast, do it before file extension check
 
   /// Check if can demux the file, return DEMUXER_TYPE_xxx on success
-  int (*check_file)(struct demuxer_st *demuxer); ///< Mandatory if safe_check == 1, else optional
+  int (*check_file)(struct demuxer *demuxer); ///< Mandatory if safe_check == 1, else optional
   /// Get packets from file, return 0 on eof
-  int (*fill_buffer)(struct demuxer_st *demuxer, demux_stream_t *ds); ///< Mandatory
+  int (*fill_buffer)(struct demuxer *demuxer, demux_stream_t *ds); ///< Mandatory
   /// Open the demuxer, return demuxer on success, NULL on failure
-  struct demuxer_st* (*open)(struct demuxer_st *demuxer); ///< Optional
+  struct demuxer* (*open)(struct demuxer *demuxer); ///< Optional
   /// Close the demuxer
-  void (*close)(struct demuxer_st *demuxer); ///< Optional
+  void (*close)(struct demuxer *demuxer); ///< Optional
   // Seek
-  void (*seek)(struct demuxer_st *demuxer, float rel_seek_secs, float audio_delay, int flags); ///< Optional
+  void (*seek)(struct demuxer *demuxer, float rel_seek_secs, float audio_delay, int flags); ///< Optional
   // Control
-  int (*control)(struct demuxer_st *demuxer, int cmd, void *arg); ///< Optional
+  int (*control)(struct demuxer *demuxer, int cmd, void *arg); ///< Optional
 } demuxer_desc_t;
 
-typedef struct demux_chapter_s
+typedef struct demux_chapter
 {
   uint64_t start, end;
   char* name;
 } demux_chapter_t;
 
-typedef struct demux_attachment_s
+typedef struct demux_attachment
 {
   char* name;
   char* type;
@@ -219,7 +219,7 @@ typedef struct demux_attachment_s
   unsigned int data_size;
 } demux_attachment_t;
 
-typedef struct demuxer_st {
+typedef struct demuxer {
   const demuxer_desc_t *desc;  ///< Demuxer description structure
   off_t filepos; // input stream current pos.
   off_t movi_start;
@@ -334,7 +334,7 @@ static inline void *realloc_struct(void *ptr, size_t nmemb, size_t size) {
   return realloc(ptr, nmemb * size);
 }
 
-demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id);
+demux_stream_t* new_demuxer_stream(struct demuxer *demuxer,int id);
 demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id,char *filename);
 void free_demuxer_stream(demux_stream_t *ds);
 void free_demuxer(demuxer_t *demuxer);