[MPlayer-cvslog] r32431 - in trunk/libmpdemux: demux_mpg.c demux_ts.c demux_ty.c

[diego]

Author: diego
Date: Sun Oct  3 17:32:53 2010
New Revision: 32431

Log:
Replace forward declarations of skip_audio_frame() by proper #include.

Modified:
   trunk/libmpdemux/demux_mpg.c
   trunk/libmpdemux/demux_ts.c
   trunk/libmpdemux/demux_ty.c

Modified: trunk/libmpdemux/demux_mpg.c
==============================================================================
--- trunk/libmpdemux/demux_mpg.c	Sun Oct  3 17:28:49 2010	(r32430)
+++ trunk/libmpdemux/demux_mpg.c	Sun Oct  3 17:32:53 2010	(r32431)
@@ -29,6 +29,7 @@
 #include "mpcommon.h"
 #include "help_mp.h"
 
+#include "libmpcodecs/dec_audio.h"
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "parse_es.h"
@@ -899,8 +900,6 @@ do{
   return 1;
 }
 
-void skip_audio_frame(sh_audio_t *sh_audio);
-
 static void demux_seek_mpg(demuxer_t *demuxer, float rel_seek_secs,
                            float audio_delay, int flags)
 {

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	Sun Oct  3 17:28:49 2010	(r32430)
+++ trunk/libmpdemux/demux_ts.c	Sun Oct  3 17:32:53 2010	(r32431)
@@ -31,6 +31,7 @@
 #include "mpcommon.h"
 #include "help_mp.h"
 
+#include "libmpcodecs/dec_audio.h"
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "parse_es.h"
@@ -3167,8 +3168,6 @@ static int ts_parse(demuxer_t *demuxer ,
 }
 
 
-void skip_audio_frame(sh_audio_t *sh_audio);
-
 static void reset_fifos(demuxer_t *demuxer, int a, int v, int s)
 {
 	ts_priv_t* priv = demuxer->priv;

Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c	Sun Oct  3 17:28:49 2010	(r32430)
+++ trunk/libmpdemux/demux_ty.c	Sun Oct  3 17:32:53 2010	(r32431)
@@ -39,6 +39,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
+#include "libmpcodecs/dec_audio.h"
 #include "libvo/sub.h"
 #include "stream/stream.h"
 #include "demuxer.h"
@@ -49,8 +50,6 @@
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 
-void skip_audio_frame( sh_audio_t *sh_audio );
-
 // 2/c0: audio data
 // 3/c0: audio packet header (PES header)
 // 4/c0: audio data (S/A only?)