[MPlayer-cvslog] r30618 - in trunk/libmpdemux: demux_ts.c demux_ts.h muxer_mpeg.c

[diego]

Author: diego
Date: Wed Feb 17 23:40:50 2010
New Revision: 30618

Log:
Add separate header for mp_a52_framesize(); avoids forward declarations.

Added:
   trunk/libmpdemux/demux_ts.h
Modified:
   trunk/libmpdemux/demux_ts.c
   trunk/libmpdemux/muxer_mpeg.c

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	Wed Feb 17 23:33:21 2010	(r30617)
+++ trunk/libmpdemux/demux_ts.c	Wed Feb 17 23:40:50 2010	(r30618)
@@ -34,9 +34,9 @@
 #include "demuxer.h"
 #include "parse_es.h"
 #include "stheader.h"
-
 #include "ms_hdr.h"
 #include "mpeg_hdr.h"
+#include "demux_ts.h"
 
 #define TS_PH_PACKET_SIZE 192
 #define TS_FEC_PACKET_SIZE 204

Added: trunk/libmpdemux/demux_ts.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libmpdemux/demux_ts.h	Wed Feb 17 23:40:50 2010	(r30618)
@@ -0,0 +1,26 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_DEMUX_TS_H
+#define MPLAYER_DEMUX_TS_H
+
+#include <stdint.h>
+
+int mp_a52_framesize(uint8_t *buf, int *srate);
+
+#endif /* MPLAYER_DEMUX_TS_H */

Modified: trunk/libmpdemux/muxer_mpeg.c
==============================================================================
--- trunk/libmpdemux/muxer_mpeg.c	Wed Feb 17 23:33:21 2010	(r30617)
+++ trunk/libmpdemux/muxer_mpeg.c	Wed Feb 17 23:40:50 2010	(r30618)
@@ -32,6 +32,7 @@
 #include "stream/stream.h"
 #include "muxer.h"
 #include "demuxer.h"
+#include "demux_ts.h"
 #include "stheader.h"
 #include "m_option.h"
 #include "aac_hdr.h"
@@ -232,8 +233,6 @@ m_option_t mpegopts_conf[] = {
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
-int mp_a52_framesize(uint8_t *buf, int *srate);
-
 static void fix_audio_sys_header(muxer_priv_t *priv, uint8_t id, uint8_t newid, uint32_t size)
 {
 	uint8_t i;