diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 22:22:51 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 22:22:51 +0000 |
commit | 2df3416d32c3e1732bbf96a8b020792db40ad7a2 (patch) | |
tree | ef6d895d1e0c079e057461ab221cd6251ffae272 | |
parent | 69429048a21918a0e109ba106ad2161c4a413f03 (diff) |
Add separate header for real_fix_timestamp(); avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30615 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpdemux/demux_mkv.c | 3 | ||||
-rw-r--r-- | libmpdemux/demux_real.c | 1 | ||||
-rw-r--r-- | libmpdemux/demux_real.h | 28 |
3 files changed, 30 insertions, 2 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index d2ee9be643..ecb171c551 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -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_track_t *track, char *block, 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 --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index de6ff785ee..78a404b826 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -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 --git a/libmpdemux/demux_real.h b/libmpdemux/demux_real.h new file mode 100644 index 0000000000..9c58bbf89a --- /dev/null +++ b/libmpdemux/demux_real.h @@ -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 */ |