path: root/sub/sd_ass.c
diff options
authorwm4 <wm4@nowhere>2012-10-04 17:16:40 +0200
committerwm4 <wm4@nowhere>2012-10-16 07:26:32 +0200
commitcc05910f16a5ccd8e3dca26a89e9c3835cbdb645 (patch)
treea95fcec3775de31f0fd5b4f52a43f60115bc292c /sub/sd_ass.c
parent05f4f00e24caf23646a2b551b8e1a1a1abe76de7 (diff)
sub: cosmetics: move things around
Move sub-bitmap definitions from dec_sub.h to sub.h. While it's a bit odd that OSD data structures are in a file named sub.h, it's definitely way too strange to have them in a file about subtitle decoding. (Maybe sub.h/.c and the sub/ directory should be split out and renamed "osd" at a later point.) Remove including ass_mp.h (and the libass headers) where possible. Remove typedefs for mp_eosd_res and sub_bitmaps structs. Store a mp_eosd_res struct in osd_state instead of just w/h. Note that sbtitles might be rendered using different sizes/margins when filters are involved (the subtitle renderer is not supposed to use the OSD res directly, and the "dim" member removed in the previous commit is something different).
Diffstat (limited to 'sub/sd_ass.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index fca47c557b..44c91c6fdc 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -28,6 +28,7 @@
#include "mp_msg.h"
#include "libmpdemux/stheader.h"
#include "sub.h"
+#include "dec_sub.h"
#include "ass_mp.h"
#include "sd.h"
#include "subassconvert.h"