RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

stheader: minor cleanup 

Move codec_tags.h include to demux_mkv.c, because this is the only file
which still uses it.

Move new_sh_stream() to demux.h, because this is more proper.
This commit is contained in:
wm4 2013-07-11 19:35:09 +02:00
parent 4cda1d113e
commit ac080c77fb
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demux/demux.h
View File

@ -232,6 +232,8 @@ double demux_get_next_pts(struct sh_stream *sh);
bool demux_has_packet(struct sh_stream *sh); bool demux_has_packet(struct sh_stream *sh);
bool demux_stream_eof(struct sh_stream *sh); bool demux_stream_eof(struct sh_stream *sh);
struct sh_stream *new_sh_stream(struct demuxer *demuxer, enum stream_type type);
struct demuxer *demux_open(struct MPOpts *opts, struct stream *stream, struct demuxer *demux_open(struct MPOpts *opts, struct stream *stream,
int file_format, char *filename); int file_format, char *filename);

2
demux/demux_mkv.c
View File

@ -49,7 +49,7 @@
#include "stheader.h" #include "stheader.h"
#include "ebml.h" #include "ebml.h"
#include "matroska.h" #include "matroska.h"
//#include "demux_real.h" #include "codec_tags.h"
#include "core/mp_msg.h" #include "core/mp_msg.h"

5
demux/stheader.h
View File

@ -21,8 +21,6 @@
#include <stdbool.h> #include <stdbool.h>
#include "codec_tags.h"
#include "audio/chmap.h" #include "audio/chmap.h"
#include "ms_hdr.h" #include "ms_hdr.h"
struct MPOpts; struct MPOpts;
@ -150,7 +148,4 @@ typedef struct sh_sub {
struct dec_sub *dec_sub; // decoder context struct dec_sub *dec_sub; // decoder context
} sh_sub_t; } sh_sub_t;
// demuxer.c:
struct sh_stream *new_sh_stream(struct demuxer *demuxer, enum stream_type type);
#endif /* MPLAYER_STHEADER_H */ #endif /* MPLAYER_STHEADER_H */