path: root/sub/sd_ass.c
diff options
authorUoti Urpala <>2012-08-16 18:21:21 +0300
committerwm4 <wm4@nowhere>2012-09-18 21:04:46 +0200
commit44d8ec9272ad265aae02b064a0c5f4a80db5a107 (patch)
treec7a7b311f0022c26cc783f6020bf0c50f90395ef /sub/sd_ass.c
parent435d7c97c900a53adedcca32b07bb4a9a5f890d3 (diff)
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.
Diffstat (limited to 'sub/sd_ass.c')
1 files changed, 2 insertions, 1 deletions
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)
-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,