From 44d8ec9272ad265aae02b064a0c5f4a80db5a107 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 16 Aug 2012 18:21:21 +0300 Subject: sd_lavc: use subtitle framework for former av_sub.c code Change libavcodec subtitle decoding code (used for some bitmap subtitle types) to use the same decoding framework as sd_ass. The functionality that was previously in av_sub.c and was directly called from mplayer.c is now in sd_lavc.c. Conflicts: mplayer.c sub/av_sub.h sub/sd_lavc.c Merged from mplayer2. The remaining use of is_av_sub() is replaced by a check whether a subtitle decoder is active, which should give the same results. --- sub/sd_ass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sub/sd_ass.c') diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 69587646e4..b8924fbb3f 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -43,7 +43,7 @@ static void free_last_event(ASS_Track *track) track->n_events--; } -static void init(struct sh_sub *sh, struct osd_state *osd) +static int init(struct sh_sub *sh, struct osd_state *osd) { struct sd_ass_priv *ctx; @@ -65,6 +65,7 @@ static void init(struct sh_sub *sh, struct osd_state *osd) osd->ass_track = ctx->ass_track; osd->vsfilter_aspect = sh->type == 'a'; osd->ass_track_changed = true; + return 0; } static void decode(struct sh_sub *sh, struct osd_state *osd, void *data, -- cgit v1.2.3