From ebaaa41f2a4f2d492141f8af86a1d0694778baae Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 3 Aug 2012 00:12:46 +0200 Subject: Remove teletext support Teletext requires special OSD support. Because I can't even test teletext, I can't restore support for it. Since teletext can be considered ancient and obscure, and since it doesn't make sense to keep the remaining teletext code without being able to use it, I'm removing it. --- libmpdemux/demuxer.c | 3 --- libmpdemux/demuxer.h | 3 --- 2 files changed, 6 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index d6e7584915..f68c8c93f6 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -41,7 +41,6 @@ #include "mf.h" #include "libaf/af_format.h" -#include "libmpcodecs/dec_teletext.h" #include "libavcodec/avcodec.h" #if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE @@ -417,8 +416,6 @@ void free_demuxer(demuxer_t *demuxer) free_demuxer_stream(demuxer->sub); skip_streamfree: free(demuxer->filename); - if (demuxer->teletext) - teletext_control(demuxer->teletext, TV_VBI_CONTROL_STOP, NULL); talloc_free(demuxer); } diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 295c148ec0..10ccc0b8e4 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -248,9 +248,6 @@ typedef struct demuxer { struct sh_video *v_streams[MAX_V_STREAMS]; struct sh_sub *s_streams[MAX_S_STREAMS]; - // teletext decoder private data, if demuxer stream contains teletext - void *teletext; - struct demux_chapter *chapters; int num_chapters; -- cgit v1.2.3