1 |
grobian 12/04/29 10:44:59 |
2 |
|
3 |
Added: faac-1.28-inttypes.patch |
4 |
Log: |
5 |
Add inttypes patch for Solaris, added Prefix keywords, bug #413591 |
6 |
|
7 |
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-libs/faac/files/faac-1.28-inttypes.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/faac/files/faac-1.28-inttypes.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/faac/files/faac-1.28-inttypes.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: faac-1.28-inttypes.patch |
16 |
=================================================================== |
17 |
use standard integer types, not linux ones |
18 |
|
19 |
--- frontend/main.c |
20 |
+++ frontend/main.c |
21 |
@@ -440,13 +440,13 @@ |
22 |
MP4TrackId MP4track = 0; |
23 |
unsigned int ntracks = 0, trackno = 0; |
24 |
unsigned int ndiscs = 0, discno = 0; |
25 |
- u_int8_t compilation = 0; |
26 |
+ uint8_t compilation = 0; |
27 |
const char *artist = NULL, *title = NULL, *album = NULL, *year = NULL, |
28 |
*genre = NULL, *comment = NULL, *writer = NULL; |
29 |
- u_int8_t *art = NULL; |
30 |
- u_int64_t artSize = 0; |
31 |
- u_int64_t total_samples = 0; |
32 |
- u_int64_t encoded_samples = 0; |
33 |
+ uint8_t *art = NULL; |
34 |
+ uint64_t artSize = 0; |
35 |
+ uint64_t total_samples = 0; |
36 |
+ uint64_t encoded_samples = 0; |
37 |
unsigned int delay_samples; |
38 |
unsigned int frameSize; |
39 |
#endif |
40 |
@@ -647,7 +647,7 @@ |
41 |
FILE *artFile = fopen(optarg, "rb"); |
42 |
|
43 |
if(artFile) { |
44 |
- u_int64_t r; |
45 |
+ uint64_t r; |
46 |
|
47 |
fseek(artFile, 0, SEEK_END); |
48 |
artSize = ftell(artFile); |
49 |
@@ -1112,7 +1112,7 @@ |
50 |
if (bytesWritten > 0) |
51 |
{ |
52 |
#ifdef HAVE_LIBMP4V2 |
53 |
- u_int64_t samples_left = total_samples - encoded_samples + delay_samples; |
54 |
+ uint64_t samples_left = total_samples - encoded_samples + delay_samples; |
55 |
MP4Duration dur = samples_left > frameSize ? frameSize : samples_left; |
56 |
MP4Duration ofs = encoded_samples > 0 ? 0 : delay_samples; |