diff options
author | wm4 <wm4@nowhere> | 2020-03-18 22:45:59 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2020-03-18 22:45:59 +0100 |
commit | 0b9ed9c2744ada1eefc1f254c5f3ade6c626ed72 (patch) | |
tree | 3085f56bafaaf9acc1dad20e8ea44d5e7071d475 /sub | |
parent | cb82cbbbae99d5b8beebae76320a9097a2bc34f7 (diff) | |
download | mpv-0b9ed9c2744ada1eefc1f254c5f3ade6c626ed72.tar.bz2 mpv-0b9ed9c2744ada1eefc1f254c5f3ade6c626ed72.tar.xz |
build: make libass non-optional
Using mpv without libass isn't really supported, since it's not only
used to display ASS subtitles, but all text subtitles, and even OSD.
At least 1 user complained that the player printed a warning if built
without libass. Avoid trying to create the impression that using this
software without libass is in any way supported or desirable, and make
it fully mandatory.
(As far as making dependencies optional goes, I'd rather make ffmpeg
optional, which is an oversized and bloated library, rather than
something tiny like libass.)
Diffstat (limited to 'sub')
-rw-r--r-- | sub/dec_sub.c | 2 | ||||
-rw-r--r-- | sub/osd_dummy.c | 39 |
2 files changed, 0 insertions, 41 deletions
diff --git a/sub/dec_sub.c b/sub/dec_sub.c index 430f8aefbe..3842235c46 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -39,9 +39,7 @@ extern const struct sd_functions sd_lavc; static const struct sd_functions *const sd_list[] = { &sd_lavc, -#if HAVE_LIBASS &sd_ass, -#endif NULL }; diff --git a/sub/osd_dummy.c b/sub/osd_dummy.c deleted file mode 100644 index db032ec5b1..0000000000 --- a/sub/osd_dummy.c +++ /dev/null @@ -1,39 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "config.h" -#include "mpv_talloc.h" -#include "osd_state.h" - -void osd_init_backend(struct osd_state *osd) -{ -} - -void osd_destroy_backend(struct osd_state *osd) -{ -} - -void osd_get_function_sym(char *buffer, size_t buffer_size, int osd_function) -{ -} - -void osd_object_get_bitmaps(struct osd_state *osd, struct osd_object *obj, - int format, struct sub_bitmaps *out_imgs) -{ - *out_imgs = (struct sub_bitmaps) {0}; -} - -void osd_set_external(struct osd_state *osd, struct osd_external_ass *ov) -{ -} - -void osd_set_external_remove_owner(struct osd_state *osd, void *owner) -{ -} - -void osd_get_text_size(struct osd_state *osd, int *out_screen_h, int *out_font_h) -{ - *out_screen_h = 0; - *out_font_h = 0; -} |