diff options
author | Uoti Urpala <uau@mplayer2.org> | 2012-08-16 18:21:21 +0300 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-09-18 21:04:46 +0200 |
commit | 44d8ec9272ad265aae02b064a0c5f4a80db5a107 (patch) | |
tree | c7a7b311f0022c26cc783f6020bf0c50f90395ef /mpbswap.h | |
parent | 435d7c97c900a53adedcca32b07bb4a9a5f890d3 (diff) | |
download | mpv-44d8ec9272ad265aae02b064a0c5f4a80db5a107.tar.bz2 mpv-44d8ec9272ad265aae02b064a0c5f4a80db5a107.tar.xz |
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 'mpbswap.h')
0 files changed, 0 insertions, 0 deletions