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 /libmpdemux/demux_ty.c | |
| 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).
Diffstat (limited to 'libmpdemux/demux_ty.c')
| -rw-r--r-- | libmpdemux/demux_ty.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 ) |