/[tivodecode]/mplayer_demuxer/trunk/mplayer-tivo-demuxer.patch
ViewVC logotype

Contents of /mplayer_demuxer/trunk/mplayer-tivo-demuxer.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 68 - (show annotations) (download)
Wed Dec 13 21:00:23 2006 UTC (15 years, 1 month ago) by jeremyd2019
File size: 2362 byte(s)
add work-in-progress mplayer demuxer.  Is very hackish, need some help to clean it up.  Any volunteers?

1 Index: cfg-common.h
2 ===================================================================
3 --- cfg-common.h (revision 21610)
4 +++ cfg-common.h (working copy)
5 @@ -120,6 +120,7 @@
6
7 { "rawaudio", &demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
8 { "rawvideo", &demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
9 + { "tivo", &demux_tivo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
10
11 #ifdef HAVE_CDDA
12 { "cdda", &cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
13 @@ -370,6 +371,7 @@
14 extern int hr_mp3_seek;
15 extern m_option_t demux_rawaudio_opts[];
16 extern m_option_t demux_rawvideo_opts[];
17 +extern m_option_t demux_tivo_opts[];
18 extern m_option_t cdda_opts[];
19
20 extern char* audio_stream;
21 Index: libmpdemux/Makefile
22 ===================================================================
23 --- libmpdemux/Makefile (revision 21610)
24 +++ libmpdemux/Makefile (working copy)
25 @@ -32,6 +32,7 @@
26 demux_real.c \
27 demux_roq.c \
28 demux_smjpeg.c \
29 + demux_tivo.c \
30 demux_ts.c \
31 demux_ty.c \
32 demux_ty_osd.c \
33 Index: libmpdemux/demuxer.c
34 ===================================================================
35 --- libmpdemux/demuxer.c (revision 21610)
36 +++ libmpdemux/demuxer.c (working copy)
37 @@ -61,6 +61,7 @@
38 extern demuxer_desc_t demuxer_desc_audio;
39 extern demuxer_desc_t demuxer_desc_xmms;
40 extern demuxer_desc_t demuxer_desc_mpeg_ty;
41 +extern demuxer_desc_t demuxer_desc_tivo;
42 extern demuxer_desc_t demuxer_desc_rtp;
43 extern demuxer_desc_t demuxer_desc_lavf;
44 extern demuxer_desc_t demuxer_desc_aac;
45 @@ -109,6 +110,7 @@
46 &demuxer_desc_mpc,
47 &demuxer_desc_audio,
48 &demuxer_desc_mpeg_ty,
49 + &demuxer_desc_tivo,
50 #ifdef STREAMING_LIVE555
51 &demuxer_desc_rtp,
52 #endif
53 Index: libmpdemux/demuxer.h
54 ===================================================================
55 --- libmpdemux/demuxer.h (revision 21610)
56 +++ libmpdemux/demuxer.h (working copy)
57 @@ -55,11 +55,12 @@
58 #define DEMUXER_TYPE_MPEG_PES 41
59 #define DEMUXER_TYPE_MPEG_GXF 42
60 #define DEMUXER_TYPE_NUT 43
61 +#define DEMUXER_TYPE_TIVO 44
62
63 // This should always match the higest demuxer type number.
64 // Unless you want to disallow users to force the demuxer to some types
65 #define DEMUXER_TYPE_MIN 0
66 -#define DEMUXER_TYPE_MAX 43
67 +#define DEMUXER_TYPE_MAX 44
68
69 #define DEMUXER_TYPE_DEMUXERS (1<<16)
70 // A virtual demuxer type for the network code

cvs@jdrake.com
ViewVC Help
Powered by ViewVC 1.1.13