From 4c1deb680dacee555e7cdd5e247128d7416bac13 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 28 Dec 2015 23:23:30 +0100 Subject: sub: do charset conversion in demux_lavf.c Just so I can remove a few lines from dec_sub.c. This is slightly inelegant, as the whole subtitle file has to be read into memory, converted at once in memory, and then provided to libavformat in an awkward way by creating a memory stream instead of using demuxer->stream. It also won't be possible to force the charset on subtitles in binary container formats - but this wasn't exposed before, and we just hope this won't be ever needed. (One motivation was fixing broken files with non-UTF8 muxed.) It also won't be possible to change the charset on the fly, but this was not exposed either. --- demux/stheader.h | 1 - 1 file changed, 1 deletion(-) (limited to 'demux/stheader.h') diff --git a/demux/stheader.h b/demux/stheader.h index 8568503f70..c243eb921e 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -93,7 +93,6 @@ typedef struct sh_video { typedef struct sh_sub { double frame_based; // timestamps are frame-based (and this is the // fallback framerate used for timestamps) - char *charset; // assumed 8 bit subtitle charset (can be NULL) } sh_sub_t; #endif /* MPLAYER_STHEADER_H */ -- cgit v1.2.3