[MPlayer-cvslog] r30615 - in trunk/libmpdemux: demux_mkv.c demux_real.c demux_real.h

[diego]

Author: diego
Date: Wed Feb 17 23:22:51 2010
New Revision: 30615

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

Added:
   trunk/libmpdemux/demux_real.h
Modified:
   trunk/libmpdemux/demux_mkv.c
   trunk/libmpdemux/demux_real.c

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	Wed Feb 17 23:14:04 2010	(r30614)
+++ trunk/libmpdemux/demux_mkv.c	Wed Feb 17 23:22:51 2010	(r30615)
@@ -33,6 +33,7 @@
 #include "stheader.h"
 #include "ebml.h"
 #include "matroska.h"
+#include "demux_real.h"
 
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -2393,8 +2394,6 @@ handle_subtitles(demuxer_t *demuxer, mkv
   ds_add_packet(demuxer->sub, dp);
 }
 
-double real_fix_timestamp(unsigned char *buf, unsigned int timestamp, unsigned int format, int64_t *kf_base, int *kf_pts, double *pts);
-
 static void
 handle_realvideo (demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer,
                   uint32_t size, int block_bref)

Modified: trunk/libmpdemux/demux_real.c
==============================================================================
--- trunk/libmpdemux/demux_real.c	Wed Feb 17 23:14:04 2010	(r30614)
+++ trunk/libmpdemux/demux_real.c	Wed Feb 17 23:22:51 2010	(r30615)
@@ -47,6 +47,7 @@
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
+#include "demux_real.h"
 
 //#define mp_dbg(mod,lev, args... ) mp_msg_c((mod<<8)|lev, ## args )
 

Added: trunk/libmpdemux/demux_real.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libmpdemux/demux_real.h	Wed Feb 17 23:22:51 2010	(r30615)
@@ -0,0 +1,28 @@
+/*
+ * 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_REAL_H
+#define MPLAYER_DEMUX_REAL_H
+
+#include <stdint.h>
+
+double real_fix_timestamp(unsigned char *buf, unsigned int timestamp,
+                          unsigned int format, int64_t *kf_base,
+                          int *kf_pts, double *pts);
+
+#endif /* MPLAYER_DEMUX_REAL_H */