diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-03-24 22:13:13 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-03-24 22:23:12 +0200 |
| commit | 85f4633796c5c74d32d6824987dadbd309c66833 (patch) | |
| tree | d5e7ec3ff44e4df56f7d7539196add2648346357 | |
| parent | b10b2b5b2cd9c52cccda4d787e81ce2d5b9824d6 (diff) | |
| download | mpv-85f4633796c5c74d32d6824987dadbd309c66833.tar.bz2 mpv-85f4633796c5c74d32d6824987dadbd309c66833.tar.xz | |
demux_ty: disable -subcc functionality (demux_ty_osd)
Disable compilation of demux_ty_osd.c because of its GPL v2-only
license. This only affects TiVo files with -subcc. After this no
v2-only code should get compiled (yuv4mpeg_intern.h has a v2-only
license, but the contents of the header look like they're not
copyrightable).
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | libmpdemux/demux_ty.c | 4 | ||||
| -rw-r--r-- | libmpdemux/video.c | 4 |
3 files changed, 8 insertions, 1 deletions
@@ -406,7 +406,6 @@ SRCS_COMMON = asxparser.c \ libmpdemux/demux_smjpeg.c \ libmpdemux/demux_ts.c \ libmpdemux/demux_ty.c \ - libmpdemux/demux_ty_osd.c \ libmpdemux/demux_viv.c \ libmpdemux/demux_vqf.c \ libmpdemux/demux_y4m.c \ diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 4309ad1387..f81ea3d57b 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -41,7 +41,9 @@ #include "libmpcodecs/dec_audio.h" #include "stream/stream.h" #include "demuxer.h" +#ifdef DEMUX_TY_OSD #include "demux_ty_osd.h" +#endif #include "parse_es.h" #include "stheader.h" #include "sub/sub_cc.h" @@ -814,8 +816,10 @@ static void demux_seek_ty( demuxer_t *demuxer, float rel_seek_secs, float audio_ if( i == 0x1B3 || i == 0x1B8 ) break; // found it! if( !i || !skip_video_packet( d_video ) ) break; // EOF? } +#ifdef DEMUX_TY_OSD if ( subcc_enabled ) ty_ClearOSD( 0 ); +#endif } static int demux_ty_control( demuxer_t *demuxer,int cmd, void *arg ) diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 7000ec5f6d..3244624e77 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -32,7 +32,9 @@ #include "stream/stream.h" #include "demuxer.h" +#ifdef DEMUX_TY_OSD #include "demux_ty_osd.h" +#endif #include "stheader.h" #include "parse_es.h" #include "mpeg_hdr.h" @@ -414,11 +416,13 @@ static void process_userdata(const unsigned char* buf,int len){ // mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"video.c: process_userdata() detected Closed Captions!\n"); subcc_process_data(buf+2,len-2); } +#ifdef DEMUX_TY_OSD if( len > 2 && buf[ 0 ] == 'T' && buf[ 1 ] == 'Y' ) { ty_processuserdata( buf + 2, len - 2 ); return; } +#endif if(verbose<2) return; fprintf(stderr, "user_data: len=%3d %02X %02X %02X %02X '", len, buf[0], buf[1], buf[2], buf[3]); |