diff options
| author | wm4 <wm4@nowhere> | 2013-10-29 22:38:29 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-10-30 01:53:53 +0100 |
| commit | b19414f3bf0ae28461ef6d5048e9626e69d45319 (patch) | |
| tree | 585f81a52da4ff5a8c4f7cd52275040211994d7c /mpvcore/encode.h | |
| parent | a84258d769a3d06958a017bb3fc47521ade5751b (diff) | |
| download | mpv-b19414f3bf0ae28461ef6d5048e9626e69d45319.tar.bz2 mpv-b19414f3bf0ae28461ef6d5048e9626e69d45319.tar.xz | |
Split mplayer.c
mplayer.c was a bit too big. Split it into multiple files. I hope the
way it's split makes sense. Maybe some things don't make too much sense,
or go against intuition. These will fixed as soon as I notice them.
Some files are a bit questionable (misc.c, osd.c, configfiles.c), and
suggestions how to organize this better are welcome.
Regressions are possible due to reorganized include statements.
Obviously I didn't just copy mplayer.c's orgy of include statements, but
recreated them for each file. It's easily possible that there are
oversights and mistakes, which will show up on other platforms.
There is one actual change: the public avutil.h include is removed from
encode.h, and I tried to replace most FFMIN/FFMAX/av_clip uses. I
consider using libavutil too much as dangerous, because the set of
include files they recursively pull in is rather arbitrary and is
different between FFmpeg and Libav.
Diffstat (limited to 'mpvcore/encode.h')
| -rw-r--r-- | mpvcore/encode.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mpvcore/encode.h b/mpvcore/encode.h index acdb75c5a3..fec14045ed 100644 --- a/mpvcore/encode.h +++ b/mpvcore/encode.h @@ -2,7 +2,6 @@ #define MPLAYER_ENCODE_H #include <stdbool.h> -#include <libavutil/avutil.h> struct MPOpts; struct encode_lavc_context; @@ -15,7 +14,7 @@ void encode_lavc_free(struct encode_lavc_context *ctx); void encode_lavc_discontinuity(struct encode_lavc_context *ctx); bool encode_lavc_showhelp(struct MPOpts *opts); int encode_lavc_getstatus(struct encode_lavc_context *ctx, char *buf, int bufsize, float relative_position); -void encode_lavc_expect_stream(struct encode_lavc_context *ctx, enum AVMediaType mt); +void encode_lavc_expect_stream(struct encode_lavc_context *ctx, int mt); void encode_lavc_set_video_fps(struct encode_lavc_context *ctx, float fps); bool encode_lavc_didfail(struct encode_lavc_context *ctx); // check if encoding failed |