summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-11 19:35:09 +0200
committerwm4 <wm4@nowhere>2013-07-11 19:35:09 +0200
commitac080c77fb9835db3c5a8c42e0ea18fdf209ea09 (patch)
treec2f273297ff5d9aa62a250de656bde362206caf6
parent4cda1d113e0d9d34d7c39cf3d8861c7079f965d8 (diff)
downloadmpv-ac080c77fb9835db3c5a8c42e0ea18fdf209ea09.tar.bz2
mpv-ac080c77fb9835db3c5a8c42e0ea18fdf209ea09.tar.xz
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.
-rw-r--r--demux/demux.h2
-rw-r--r--demux/demux_mkv.c2
-rw-r--r--demux/stheader.h5
3 files changed, 3 insertions, 6 deletions
diff --git a/demux/demux.h b/demux/demux.h
index d75c8f0d12..3b0d6d5956 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -232,6 +232,8 @@ double demux_get_next_pts(struct sh_stream *sh);
bool demux_has_packet(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,
int file_format, char *filename);
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index c84bdf4392..0d174639c7 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -49,7 +49,7 @@
#include "stheader.h"
#include "ebml.h"
#include "matroska.h"
-//#include "demux_real.h"
+#include "codec_tags.h"
#include "core/mp_msg.h"
diff --git a/demux/stheader.h b/demux/stheader.h
index 2ca4bd0bae..c1f606090a 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -21,8 +21,6 @@
#include <stdbool.h>
-#include "codec_tags.h"
-
#include "audio/chmap.h"
#include "ms_hdr.h"
struct MPOpts;
@@ -150,7 +148,4 @@ typedef struct sh_sub {
struct dec_sub *dec_sub; // decoder context
} sh_sub_t;
-// demuxer.c:
-struct sh_stream *new_sh_stream(struct demuxer *demuxer, enum stream_type type);
-
#endif /* MPLAYER_STHEADER_H */