mirror of
https://github.com/mpv-player/mpv
synced 2025-04-24 12:24:21 +00:00
demuxer.h: avoid including stream.h
Drop the unnecessary include and add a missing direct include in some files. This also revealed that demux_rtp_internal.h was missing a config.h include, fix that too.
This commit is contained in:
parent
b2e213d889
commit
3043beffab
@ -25,8 +25,10 @@ extern "C" {
|
|||||||
#include <windows.h> // windows.h, but not the other way around.
|
#include <windows.h> // windows.h, but not the other way around.
|
||||||
#endif
|
#endif
|
||||||
#include "demux_rtp.h"
|
#include "demux_rtp.h"
|
||||||
|
#include "stream/stream.h"
|
||||||
#include "stheader.h"
|
#include "stheader.h"
|
||||||
#include "options.h"
|
#include "options.h"
|
||||||
|
#include "config.h"
|
||||||
}
|
}
|
||||||
#include "demux_rtp_internal.h"
|
#include "demux_rtp_internal.h"
|
||||||
|
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include "demuxer.h"
|
#include "demuxer.h"
|
||||||
|
#include "config.h"
|
||||||
#ifdef CONFIG_FFMPEG
|
#ifdef CONFIG_FFMPEG
|
||||||
#include "libavcodec/avcodec.h"
|
#include "libavcodec/avcodec.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
#include "stream/stream.h"
|
|
||||||
#include "bstr.h"
|
#include "bstr.h"
|
||||||
#include "mpcommon.h"
|
#include "mpcommon.h"
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
#include "path.h"
|
#include "path.h"
|
||||||
#include "bstr.h"
|
#include "bstr.h"
|
||||||
#include "mpcommon.h"
|
#include "mpcommon.h"
|
||||||
|
#include "stream/stream.h"
|
||||||
|
|
||||||
|
|
||||||
struct edl_source {
|
struct edl_source {
|
||||||
|
@ -31,6 +31,8 @@
|
|||||||
#include "path.h"
|
#include "path.h"
|
||||||
#include "bstr.h"
|
#include "bstr.h"
|
||||||
#include "mpcommon.h"
|
#include "mpcommon.h"
|
||||||
|
#include "stream/stream.h"
|
||||||
|
|
||||||
|
|
||||||
static char **find_files(const char *original_file, const char *suffix)
|
static char **find_files(const char *original_file, const char *suffix)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user