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.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sub/sd.h') diff --git a/sub/sd.h b/sub/sd.h index d5aea5c1a6..c36110277b 100644 --- a/sub/sd.h +++ b/sub/sd.h @@ -5,7 +5,7 @@ struct osd_state; struct sh_sub; struct sd_functions { - void (*init)(struct sh_sub *sh, struct osd_state *osd); + int (*init)(struct sh_sub *sh, struct osd_state *osd); void (*decode)(struct sh_sub *sh, struct osd_state *osd, void *data, int data_len, double pts, double duration); void (*reset)(struct sh_sub *sh, struct osd_state *osd); -- cgit v1.2.3