# HG changeset patch # User diego # Date 1266445371 0 # Node ID 02420b32391b1f4f13b22945cea0c63ac600cede # Parent 292ab27ee1fa7930830f22445455b950da2923b3 Add separate header for real_fix_timestamp(); avoids forward declarations. diff -r 292ab27ee1fa -r 02420b32391b libmpdemux/demux_mkv.c --- a/libmpdemux/demux_mkv.c Wed Feb 17 22:14:04 2010 +0000 +++ b/libmpdemux/demux_mkv.c Wed Feb 17 22:22:51 2010 +0000 @@ -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 @@ 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) diff -r 292ab27ee1fa -r 02420b32391b libmpdemux/demux_real.c --- a/libmpdemux/demux_real.c Wed Feb 17 22:14:04 2010 +0000 +++ b/libmpdemux/demux_real.c Wed Feb 17 22:22:51 2010 +0000 @@ -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 ) diff -r 292ab27ee1fa -r 02420b32391b libmpdemux/demux_real.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpdemux/demux_real.h Wed Feb 17 22:22:51 2010 +0000 @@ -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 + +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 */