From b19414f3bf0ae28461ef6d5048e9626e69d45319 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 29 Oct 2013 22:38:29 +0100 Subject: 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. --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7c9807f175..bed21f20e5 100644 --- a/Makefile +++ b/Makefile @@ -209,9 +209,17 @@ SOURCES = audio/audio.c \ mpvcore/playlist_parser.c \ mpvcore/version.c \ mpvcore/input/input.c \ + mpvcore/player/audio.c \ + mpvcore/player/configfiles.c \ mpvcore/player/command.c \ - mpvcore/player/mplayer.c \ + mpvcore/player/loadfile.c \ + mpvcore/player/main.c \ + mpvcore/player/misc.c \ + mpvcore/player/osd.c \ + mpvcore/player/playloop.c \ mpvcore/player/screenshot.c \ + mpvcore/player/sub.c \ + mpvcore/player/video.c \ mpvcore/player/timeline/tl_edl.c \ mpvcore/player/timeline/tl_matroska.c \ mpvcore/player/timeline/tl_cue.c \ -- cgit v1.2.3