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.

1 files changed, 1 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 495a42824e..4c4027787e 100644
--- a/Makefile
+++ b/Makefile
@@ -252,10 +252,10 @@ SRCS_COMMON = asxparser.c \
               stream/stream_mf.c \
               stream/stream_null.c \
               stream/url.c \
-              sub/av_sub.c \
               sub/dec_sub.c \
               sub/find_sub.c \
               sub/find_subfiles.c \
+              sub/sd_lavc.c \
               sub/spudec.c \
               sub/sub.c \
               sub/subassconvert.c \