Annotation of /trunk/libmpeg3/patches/libmpeg3-1.7-fix-includes.patch
Parent Directory | Revision Log
Revision 224 -
(hide annotations)
(download)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 3430 byte(s)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 3430 byte(s)
-new fixes
1 | niro | 224 | diff -urN libmpeg3.orig/bitstream.h libmpeg3/bitstream.h |
2 | --- libmpeg3.orig/bitstream.h Fri Dec 21 14:00:01 2001 | ||
3 | +++ libmpeg3/bitstream.h Mon Apr 15 14:13:12 2002 | ||
4 | @@ -1,7 +1,7 @@ | ||
5 | #ifndef BITSTREAM_H | ||
6 | #define BITSTREAM_H | ||
7 | |||
8 | -#include "mpeg3demux.h" | ||
9 | +#include <libmpeg3/mpeg3demux.h> | ||
10 | #include <sys/types.h> | ||
11 | |||
12 | // next bit in forward direction | ||
13 | diff -urN libmpeg3.orig/libmpeg3.h libmpeg3/libmpeg3.h | ||
14 | --- libmpeg3.orig/libmpeg3.h Fri Dec 21 10:48:14 2001 | ||
15 | +++ libmpeg3/libmpeg3.h Mon Apr 15 14:13:12 2002 | ||
16 | @@ -5,7 +5,7 @@ | ||
17 | extern "C" { | ||
18 | #endif | ||
19 | |||
20 | -#include "mpeg3private.h" | ||
21 | +#include <libmpeg3/mpeg3private.h> | ||
22 | |||
23 | |||
24 | /* Supported color models for mpeg3_read_frame */ | ||
25 | diff -urN libmpeg3.orig/mpeg3css.h libmpeg3/mpeg3css.h | ||
26 | --- libmpeg3.orig/mpeg3css.h Sun Sep 30 20:18:31 2001 | ||
27 | +++ libmpeg3/mpeg3css.h Mon Apr 15 14:13:12 2002 | ||
28 | @@ -2,7 +2,7 @@ | ||
29 | #define MPEG3CSS_H | ||
30 | |||
31 | |||
32 | -#include "mpeg3private.inc" | ||
33 | +#include <libmpeg3/mpeg3private.inc> | ||
34 | |||
35 | struct mpeg3_block | ||
36 | { | ||
37 | diff -urN libmpeg3.orig/mpeg3demux.h libmpeg3/mpeg3demux.h | ||
38 | --- libmpeg3.orig/mpeg3demux.h Fri Dec 21 14:02:21 2001 | ||
39 | +++ libmpeg3/mpeg3demux.h Mon Apr 15 14:13:12 2002 | ||
40 | @@ -1,7 +1,7 @@ | ||
41 | #ifndef MPEG3DEMUX_H | ||
42 | #define MPEG3DEMUX_H | ||
43 | |||
44 | -#include "mpeg3title.h" | ||
45 | +#include <libmpeg3/mpeg3title.h> | ||
46 | #include <stdio.h> | ||
47 | |||
48 | typedef struct | ||
49 | diff -urN libmpeg3.orig/mpeg3io.h libmpeg3/mpeg3io.h | ||
50 | --- libmpeg3.orig/mpeg3io.h Mon Dec 17 06:05:07 2001 | ||
51 | +++ libmpeg3/mpeg3io.h Mon Apr 15 14:13:12 2002 | ||
52 | @@ -4,8 +4,8 @@ | ||
53 | |||
54 | #include <stdio.h> | ||
55 | #include <stdint.h> | ||
56 | -#include "mpeg3css.h" | ||
57 | -#include "mpeg3private.inc" | ||
58 | +#include <libmpeg3/mpeg3css.h> | ||
59 | +#include <libmpeg3/mpeg3private.inc> | ||
60 | |||
61 | /* Filesystem structure */ | ||
62 | /* We buffer in MPEG3_IO_SIZE buffers. Stream IO would require back */ | ||
63 | diff -urN libmpeg3.orig/mpeg3title.h libmpeg3/mpeg3title.h | ||
64 | --- libmpeg3.orig/mpeg3title.h Wed Dec 19 06:28:25 2001 | ||
65 | +++ libmpeg3/mpeg3title.h Mon Apr 15 14:13:12 2002 | ||
66 | @@ -1,7 +1,7 @@ | ||
67 | #ifndef MPEG3TITLE_H | ||
68 | #define MPEG3TITLE_H | ||
69 | |||
70 | -#include "mpeg3io.h" | ||
71 | +#include <libmpeg3/mpeg3io.h> | ||
72 | |||
73 | // May get rid of time values and rename to a cell offset table. | ||
74 | // May also get rid of end byte. | ||
75 | diff -urN libmpeg3.orig/mpeg3vtrack.h libmpeg3/mpeg3vtrack.h | ||
76 | --- libmpeg3.orig/mpeg3vtrack.h Thu Dec 20 08:19:18 2001 | ||
77 | +++ libmpeg3/mpeg3vtrack.h Mon Apr 15 14:13:12 2002 | ||
78 | @@ -1,8 +1,8 @@ | ||
79 | #ifndef MPEG3_VTRACK_H | ||
80 | #define MPEG3_VTRACK_H | ||
81 | |||
82 | -#include "mpeg3demux.h" | ||
83 | -#include "video/mpeg3video.h" | ||
84 | +#include <libmpeg3/mpeg3demux.h> | ||
85 | +#include <libmpeg3/video/mpeg3video.h> | ||
86 | |||
87 | typedef struct | ||
88 | { | ||
89 | --- libmpeg3-1.7.1/video/mpeg3video.h.orig 2006-09-10 00:52:53.719900132 +0200 | ||
90 | +++ libmpeg3-1.7.1/video/mpeg3video.h 2006-09-10 00:55:15.688619822 +0200 | ||
91 | @@ -1,11 +1,11 @@ | ||
92 | #ifndef MPEGVIDEO_H | ||
93 | #define MPEGVIDEO_H | ||
94 | |||
95 | -#include "../bitstream.h" | ||
96 | -#include "../mpeg3private.inc" | ||
97 | -#include "idct.h" | ||
98 | -#include "slice.h" | ||
99 | -#include "../timecode.h" | ||
100 | |||
101 | +#include <libmpeg3/bitstream.h> | ||
102 | +#include <libmpeg3/mpeg3private.inc> | ||
103 | +#include <libmpeg3/video/idct.h> | ||
104 | +#include <libmpeg3/video/slice.h> | ||
105 | +#include <libmpeg3/timecode.h> | ||
106 | |||
107 | #endif | ||
108 | diff -urN libmpeg3.orig/mpeg3atrack.h libmpeg3/atrack.h | ||
109 | --- libmpeg3.orig/mpeg3atrack.h 2003-07-26 17:31:58.000000000 -0400 | ||
110 | +++ libmpeg3/mpeg3atrack.h 2003-07-26 17:32:27.000000000 -0400 | ||
111 | @@ -1,7 +1,7 @@ | ||
112 | #ifndef MPEG3ATRACK_H | ||
113 | #define MPEG3ATRACK_H | ||
114 | |||
115 | -#include "mpeg3demux.h" | ||
116 | -#include "audio/mpeg3audio.h" | ||
117 | +#include <libmpeg3/mpeg3demux.h> | ||
118 | +#include <libmpeg3/audio/mpeg3audio.h> | ||
119 | |||
120 | #endif |