diff options
| author | wm4 <wm4@nowhere> | 2013-06-01 19:54:18 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-03 22:40:02 +0200 |
| commit | e19ffa02aa370cbc3b559f85b286ea09b06ab29b (patch) | |
| tree | 3335cdcc8664d9e3b98631fe8128b138c095069a /sub/subassconvert.h | |
| parent | 14dd95154820d4ec9afb5200335177b011233049 (diff) | |
| download | mpv-e19ffa02aa370cbc3b559f85b286ea09b06ab29b.tar.bz2 mpv-e19ffa02aa370cbc3b559f85b286ea09b06ab29b.tar.xz | |
sub: turn subassconvert_ functions into sub converters
This means subassconvert.c is split in sd_srt.c and sd_microdvd.c. Now
this code is involved in the sub conversion chain like sd_movtext is.
The invocation of the converter in sd_ass.c is removed.
This requires some other changes to make the new sub converter code work
with loading external subtitles. Until now, subtitles loaded via
subreader.c was assumed to be in plaintext, or for some formats, in ASS
(except in -no-ass mode). Then these were added to an ASS_Track. Change
this so that subtitles are always in their original format (as far as
decoders/converters for them are available), and turn every sub event
read by subreader.c as packet to the dec_sub.c subtitle chain.
This removes differences between external/demuxed and -ass/-no-ass code
paths further.
Diffstat (limited to 'sub/subassconvert.h')
| -rw-r--r-- | sub/subassconvert.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/sub/subassconvert.h b/sub/subassconvert.h deleted file mode 100644 index e6a4425198..0000000000 --- a/sub/subassconvert.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Header for subtitles converter to SSA/ASS - * - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_SUBASSCONVERT_H -#define MPLAYER_SUBASSCONVERT_H - -void subassconvert_subrip(const char *orig, char *dest, int dest_buffer_size); -void subassconvert_microdvd(const char *orig, char *dest, int dest_buffer_size); - -#endif |