/[gentoo-x86]/media-libs/libdvb/files/libdvb-0.5.5.1-rename-analyze.patch
Gentoo

Contents of /media-libs/libdvb/files/libdvb-0.5.5.1-rename-analyze.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Mon Jul 24 20:10:01 2006 UTC (8 years ago) by zzam
Branch: MAIN
CVS Tags: HEAD
Now using patch to use autotools, thank to azarah.
(Portage version: 2.1.1_pre3-r4)

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

  ViewVC Help
Powered by ViewVC 1.1.20