Contents of /trunk/transcode/patches/transcode-1.0.3-lzo2.patch
Parent Directory | Revision Log
Revision 224 -
(show annotations)
(download)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 2922 byte(s)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 2922 byte(s)
-new fixes
1 | Patch to make transcode use =lzo-2* instead of old lzo-1*. |
2 | Contributed by Daniel Black <dragonheart@gentoo.org> |
3 | |
4 | See Gentoo Bug #112382 |
5 | |
6 | diff -ru transcode-1.0.2.orig/configure.in transcode-1.0.2/configure.in |
7 | --- transcode-1.0.2.orig/configure.in 2005-10-30 15:57:45.000000000 +1100 |
8 | +++ transcode-1.0.2/configure.in 2005-11-13 20:13:26.000000000 +1100 |
9 | @@ -1018,7 +1018,7 @@ |
10 | dnl |
11 | dnl LZO |
12 | dnl |
13 | -TC_PKG_CHECK(lzo, no, LZO, no, [lzo1x.h], lzo, lzo_version, lzo, |
14 | +TC_PKG_CHECK(lzo, no, LZO, no, [lzo1x.h], lzo2, lzo_version, lzo2, |
15 | [http://www.oberhumer.com/opensource/lzo/]) |
16 | TC_PKG_HAVE(lzo, LZO) |
17 | |
18 | diff -ru transcode-1.0.2.orig/export/export_lzo.c transcode-1.0.2/export/export_lzo.c |
19 | --- transcode-1.0.2.orig/export/export_lzo.c 2005-07-04 17:09:31.000000000 +1000 |
20 | +++ transcode-1.0.2/export/export_lzo.c 2005-11-13 20:09:26.000000000 +1100 |
21 | @@ -84,8 +84,8 @@ |
22 | return(TC_EXPORT_ERROR); |
23 | } |
24 | |
25 | - wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS); |
26 | - out = (lzo_bytep) lzo_malloc(vob->ex_v_height*vob->ex_v_width*3*2); |
27 | + wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS); |
28 | + out = (lzo_bytep) malloc(vob->ex_v_height*vob->ex_v_width*3*2); |
29 | |
30 | if (wrkmem == NULL || out == NULL) { |
31 | printf("[%s] out of memory\n", MOD_NAME); |
32 | @@ -270,8 +270,8 @@ |
33 | |
34 | if(param->flag == TC_VIDEO) { |
35 | |
36 | - lzo_free(wrkmem); |
37 | - lzo_free(out); |
38 | + free(wrkmem); |
39 | + free(out); |
40 | |
41 | return(0); |
42 | } |
43 | diff -ru transcode-1.0.2.orig/import/decode_lzo.c transcode-1.0.2/import/decode_lzo.c |
44 | --- transcode-1.0.2.orig/import/decode_lzo.c 2005-07-04 17:09:33.000000000 +1000 |
45 | +++ transcode-1.0.2/import/decode_lzo.c 2005-11-13 20:09:26.000000000 +1100 |
46 | @@ -65,9 +65,9 @@ |
47 | goto decoder_error; |
48 | } |
49 | |
50 | - wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS); |
51 | - out = (lzo_bytep) lzo_malloc(BUFFER_SIZE); |
52 | - inbuf = (lzo_bytep) lzo_malloc(BUFFER_SIZE); |
53 | + wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS); |
54 | + out = (lzo_bytep) malloc(BUFFER_SIZE); |
55 | + inbuf = (lzo_bytep) malloc(BUFFER_SIZE); |
56 | |
57 | if (wrkmem == NULL || out == NULL) { |
58 | fprintf(stderr, "[%s] out of memory\n", MOD_NAME); |
59 | diff -ru transcode-1.0.2.orig/import/import_lzo.c transcode-1.0.2/import/import_lzo.c |
60 | --- transcode-1.0.2.orig/import/import_lzo.c 2005-07-04 17:09:33.000000000 +1000 |
61 | +++ transcode-1.0.2/import/import_lzo.c 2005-11-13 20:09:26.000000000 +1100 |
62 | @@ -117,8 +117,8 @@ |
63 | return(TC_IMPORT_ERROR); |
64 | } |
65 | |
66 | - wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS); |
67 | - out = (lzo_bytep) lzo_malloc(BUFFER_SIZE); |
68 | + wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS); |
69 | + out = (lzo_bytep) malloc(BUFFER_SIZE); |
70 | |
71 | if (wrkmem == NULL || out == NULL) { |
72 | printf("[%s] out of memory\n", MOD_NAME); |
73 | @@ -236,8 +236,8 @@ |
74 | |
75 | if(param->flag == TC_VIDEO) { |
76 | |
77 | - lzo_free(wrkmem); |
78 | - lzo_free(out); |
79 | + free(wrkmem); |
80 | + free(out); |
81 | |
82 | if(avifile2!=NULL) { |
83 | AVI_close(avifile2); |