mirror of https://github.com/mpv-player/mpv
Reduce stheader.h includes, move stream types to mp_common.h
This commit is contained in:
parent
36744a30fb
commit
f99aff1b31
|
@ -21,18 +21,12 @@
|
|||
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "mpvcore/mp_common.h"
|
||||
#include "audio/chmap.h"
|
||||
#include "ms_hdr.h"
|
||||
struct MPOpts;
|
||||
struct demuxer;
|
||||
|
||||
enum stream_type {
|
||||
STREAM_VIDEO,
|
||||
STREAM_AUDIO,
|
||||
STREAM_SUB,
|
||||
STREAM_TYPE_COUNT,
|
||||
};
|
||||
|
||||
// Stream headers:
|
||||
|
||||
struct sh_stream {
|
||||
|
|
|
@ -52,6 +52,13 @@
|
|||
#define CONTROL_ERROR -2
|
||||
#define CONTROL_NA -3
|
||||
|
||||
enum stream_type {
|
||||
STREAM_VIDEO,
|
||||
STREAM_AUDIO,
|
||||
STREAM_SUB,
|
||||
STREAM_TYPE_COUNT,
|
||||
};
|
||||
|
||||
extern const char *mplayer_version;
|
||||
extern const char *mplayer_builddate;
|
||||
|
||||
|
|
|
@ -53,6 +53,7 @@
|
|||
#include "audio/decode/dec_audio.h"
|
||||
#include "audio/out/ao.h"
|
||||
#include "audio/mixer.h"
|
||||
#include "demux/demux.h"
|
||||
#include "stream/stream.h"
|
||||
#include "sub/ass_mp.h"
|
||||
#include "sub/sub.h"
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include "mpvcore/input/input.h"
|
||||
|
||||
#include "audio/out/ao.h"
|
||||
#include "demux/demux.h"
|
||||
#include "stream/stream.h"
|
||||
#include "video/out/vo.h"
|
||||
|
||||
|
|
|
@ -21,9 +21,8 @@
|
|||
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "compat/compiler.h"
|
||||
#include "mpvcore/mp_common.h"
|
||||
#include "mpvcore/options.h"
|
||||
#include "demux/demux.h"
|
||||
|
||||
// definitions used internally by the core player code
|
||||
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
#include "osdep/getch2.h"
|
||||
#include "osdep/timer.h"
|
||||
|
||||
#include "demux/demux.h"
|
||||
#include "sub/sub.h"
|
||||
|
||||
#include "mp_core.h"
|
||||
|
|
|
@ -43,7 +43,6 @@
|
|||
#include "mpvcore/path.h"
|
||||
#include "osdep/timer.h"
|
||||
#include "stream.h"
|
||||
#include "demux/demux.h"
|
||||
|
||||
#include "mpvcore/m_option.h"
|
||||
#include "mpvcore/m_config.h"
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
#include "mpvcore/mp_msg.h"
|
||||
#include "mpvcore/m_option.h"
|
||||
#include "stream.h"
|
||||
#include "demux/stheader.h"
|
||||
|
||||
#define BLURAY_SECTOR_SIZE 6144
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@
|
|||
|
||||
#include "stream_dvd.h"
|
||||
#include "stream_dvd_common.h"
|
||||
#include "demux/demux.h"
|
||||
|
||||
static char* dvd_device_current;
|
||||
int dvd_angle=1;
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
#endif
|
||||
|
||||
#include "stream.h"
|
||||
#include "demux/demux.h"
|
||||
#include "mpvcore/m_option.h"
|
||||
#include "mpvcore/mp_msg.h"
|
||||
#include "stream_radio.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "mpvcore/mp_msg.h"
|
||||
#include "mpvcore/av_common.h"
|
||||
#include "mpvcore/options.h"
|
||||
#include "demux/stheader.h"
|
||||
#include "video/mp_image.h"
|
||||
#include "sd.h"
|
||||
#include "dec_sub.h"
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include "talloc.h"
|
||||
#include "mpvcore/options.h"
|
||||
#include "demux/stheader.h"
|
||||
#include "video/mp_image.h"
|
||||
#include "sd.h"
|
||||
#include "sub.h"
|
||||
|
|
Loading…
Reference in New Issue