1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
|
diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc libdvb-0.5.5.1/dvb-mpegtools/main.cc
--- libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc 2006-07-24 21:48:22.000000000 +0200
+++ libdvb-0.5.5.1/dvb-mpegtools/main.cc 2006-07-24 21:50:03.000000000 +0200
@@ -54,7 +54,7 @@
#define PROGS 29
-char *prognames[PROGS+1] = { "streamtype", // 0
+char *prognames[PROGS+1] = { "streamtype_mpg", // 0
"ts2pes", // 1
"ps2vid",
"pes2aud_es",
@@ -63,7 +63,7 @@
"pes2vid",
"tspids",
"pes2ts",
- "analyze",
+ "analyze_mpg",
"pes_demux", // 10
"es_demux",
"ts_demux",
@@ -87,7 +87,7 @@
};
-enum { streamtype_, // 0
+enum { streamtype_mpg_, // 0
ts2pes_, // 1
ps2vid_,
pes2aud_es_,
@@ -96,7 +96,7 @@
pes2vid_,
tspids_,
pes2ts_,
- analyze_,
+ analyze_mpg_,
pes_demux_, // 10
es_demux_,
ts_demux_,
@@ -123,9 +123,9 @@
{
switch(progn) {
- case streamtype_:
- cerr << "usage: streamtype <filename>" << endl;
- cerr << "or streamtype < <filename> (or pipe)" << endl;
+ case streamtype_mpg_:
+ cerr << "usage: streamtype_mpg <filename>" << endl;
+ cerr << "or streamtype_mpg < <filename> (or pipe)" << endl;
break;
case ts2pes_:
@@ -175,9 +175,9 @@
cerr << " (or pipe)" << endl;
break;
- case analyze_:
- cerr << "usage: analyze <filename>" << endl;
- cerr << " or analyze < <filename> (or pipe)" << endl;
+ case analyze_mpg_:
+ cerr << "usage: analyze_mpg <filename>" << endl;
+ cerr << " or analyze_mpg < <filename> (or pipe)" << endl;
break;
case pes_demux_:
@@ -320,7 +320,7 @@
}
switch( progn ) {
- case streamtype_: {
+ case streamtype_mpg_: {
char *streams[4] = { "PS_STREAM", "TS_STREAM"
, "PES_STREAM"};
char *tv_form[3] = {"DUNNO", "PAL", "NTSC"};
@@ -426,7 +426,7 @@
}
break;
- case analyze_:
+ case analyze_mpg_:
if (fd == STDIN_FILENO) {
analyze(cin);
} else {
diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile.am libdvb-0.5.5.1/dvb-mpegtools/Makefile.am
--- libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile.am 2006-07-24 21:48:22.000000000 +0200
+++ libdvb-0.5.5.1/dvb-mpegtools/Makefile.am 2006-07-24 22:04:56.000000000 +0200
@@ -21,8 +21,8 @@
LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la
LINKS = \
- streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
- tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
+ streamtype_mpg ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
+ tspids pes2ts analyze_mpg pes_demux es_demux ts_demux ts_es_demux \
pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es \
insert_pat_pmt get_http extract_pes extract_pes_payload \
change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/README libdvb-0.5.5.1/dvb-mpegtools/README
--- libdvb-0.5.5.1-orig/dvb-mpegtools/README 2006-07-24 21:48:22.000000000 +0200
+++ libdvb-0.5.5.1/dvb-mpegtools/README 2006-07-24 21:50:03.000000000 +0200
@@ -21,10 +21,10 @@
get_http http://mymachine:8090/test.avi | mplayer -
usage: get_http <URL>
-streamtype
+streamtype_mpg (original name was streamtype, renamed to avoid name collisions)
tries to recognize the stream type and gives information about the stream.
-usage: streamtype <filename>
-or streamtype < <filename> (or pipe)
+usage: streamtype_mpg <filename>
+or streamtype_mpg < <filename> (or pipe)
ts2ps
ts2pes
@@ -70,11 +70,11 @@
usage: pes2ts2 <filename> <audio PID> <video PID>
or pes2ts2 < <filename> <audio PID> <video PID> (or pipe)
-analyze
+analyze_mpg (original name was analyze, renamed to avoid name collisions)
gives some information about a PS/PES stream and all the packets
contained therein.
-usage: analyze <filename>
-or analyze < <filename> (or pipe)
+usage: analyze_mpg <filename>
+or analyze_mpg < <filename> (or pipe)
pes_demux
es_demux
|
