diff options
author | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-21 08:18:51 +0000 |
---|---|---|
committer | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-21 08:18:51 +0000 |
commit | 2f76cfc28a0466ad6dfdb7edc7affe91983d6eaa (patch) | |
tree | eb19a1c8b1633bf9a6544a56dab02f1821b6f08d /mpcommon.c | |
parent | 9a6313ed24efaeb22b86ddc6309ee28e3bbde0e4 (diff) | |
download | mpv-2f76cfc28a0466ad6dfdb7edc7affe91983d6eaa.tar.bz2 mpv-2f76cfc28a0466ad6dfdb7edc7affe91983d6eaa.tar.xz |
Revert r23530.
r23530 breaks policy: notification was not sent to mailing list,
agreements of other devs were not received.
Code also should be reviewed/cleaned up/fixed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23593 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mpcommon.c')
-rw-r--r-- | mpcommon.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/mpcommon.c b/mpcommon.c index 7734c443d0..9a5c52accc 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -7,9 +7,6 @@ #include "libvo/video_out.h" #include "spudec.h" #include "vobsub.h" -#ifdef HAVE_TV_TELETEXT -#include "stream/tv.h" -#endif double sub_last_pts = -303; @@ -141,31 +138,3 @@ void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset) } current_module=NULL; } - -void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset) -{ -#ifdef HAVE_TV_TELETEXT - int half_page; - tvi_handle_t *tvh = demuxer->priv; - if (demuxer->type != DEMUXER_TYPE_TV) return; - if(!tvh) return; - if(vo_spudec) { - tv_teletext_img_t* img=tv_get_teletext_imgpage(tvh); - if(img!=NULL) { - spudec_heartbeat_teletext(vo_spudec, img); - if(img->canvas) - free(img->canvas); - free(img); - vo_osd_changed(OSDTYPE_SPU); - vo_osd_teletex_text=NULL; - vo_osd_changed(OSDTYPE_TELETEXT); - return; - } - vo_osd_changed(OSDTYPE_SPU); - } - vo_osd_teletex_text=tv_get_teletext_txtpage(tvh); - tv_teletext_control(tvh,TVI_CONTROL_VBI_GET_HALF_PAGE,&half_page); - vo_osd_teletext_flip=half_page; - vo_osd_changed(OSDTYPE_TELETEXT); -#endif -} |