Ticket #458: diff_mplayer.diff

File diff_mplayer.diff, 92.6 KB (added by stranche@…, 20 years ago)

diff between the original tree

Line 
1diff -r main/codec-cfg.c main2/codec-cfg.c
21029c1029
3< print_int_array((signed int*)(cod[i][j].fourcc), CODECS_MAX_FOURCC);
4---
5> print_int_array(cod[i][j].fourcc, CODECS_MAX_FOURCC);
61032c1032
7< print_int_array((signed int*)(cod[i][j].fourccmap), CODECS_MAX_FOURCC);
8---
9> print_int_array(cod[i][j].fourccmap, CODECS_MAX_FOURCC);
101035c1035
11< print_int_array((signed int*)(cod[i][j].outfmt), CODECS_MAX_OUTFMT);
12---
13> print_int_array(cod[i][j].outfmt, CODECS_MAX_OUTFMT);
141038c1038
15< print_char_array((unsigned char*)(cod[i][j].outflags), CODECS_MAX_OUTFMT);
16---
17> print_char_array(cod[i][j].outflags, CODECS_MAX_OUTFMT);
181041c1041
19< print_int_array((signed int*)(cod[i][j].infmt), CODECS_MAX_INFMT);
20---
21> print_int_array(cod[i][j].infmt, CODECS_MAX_INFMT);
22diff -r main/config.mak main2/config.mak
2376c76
24< SRC_PATH=/home/stranche/test/main
25---
26> SRC_PATH=/home/stranche/sauv-mplayer/main
27diff -r main/DOCS/man/en/CVS/Entries main2/DOCS/man/en/CVS/Entries
281c1
29< /mplayer.1/1.1231/Mon Feb 20 09:36:10 2006//
30---
31> /mplayer.1/1.1232/Mon Feb 20 23:50:40 2006//
32diff -r main/DOCS/man/en/mplayer.1 main2/DOCS/man/en/mplayer.1
331c1
34< .\" $Revision: 1.1231 $
35---
36> .\" $Revision: 1.1232 $
37643c643
38< Use the given profile(s), \-profile help display a list of the defined profiles.
39---
40> Use the given profile(s), \-profile help displays a list of the defined profiles.
411353a1354,1359
42> .B \-rtsp-port (LIVE555 only)
43> Used with 'rtsp://' URLs to force the client's port number.
44> This option may be useful if you are behind a router and want to forward
45> the RTSP stream from the server to a specific client.
46> .
47> .TP
481361,1366d1366
49< .B \-rtsp-port (LIVE555 only)
50< Used with 'rtsp://' URLs to force the client's port number.
51< This option may be useful if you're behind a router and want to forward the
52< RTSP stream from the server to a specific client.
53< .
54< .TP
55diff -r main/DOCS/man/fr/CVS/Entries main2/DOCS/man/fr/CVS/Entries
561c1
57< /mplayer.1/1.389/Sun Feb 19 21:39:58 2006//
58---
59> /mplayer.1/1.390/Mon Feb 20 21:05:36 2006//
60diff -r main/DOCS/man/fr/mplayer.1 main2/DOCS/man/fr/mplayer.1
611c1
62< .\" synced with 1.1229
63---
64> .\" synced with 1.1231
651166a1167,1177
66> .B \-ignore-start
67> Ignore le temps de démarrage pour les flux dans les fichiers AVIs.
68> Ceci permet d'ignorer le retardement du flux dans les fichiers
69> encodés avec l'option \-audio-delay.
70> Pendant l'encodage, cette option évite à MEncoder de transférer au
71> nouveau fichier le moment original de démarrage du flux\ ;
72> l'option \-audio-delay n'est pas affectée.
73> Notez que MEncoder ajuste parfois automatique les moment de démarrage
74> du flux pour compenser les délais de décodage anticipés, donc n'utilisez pas cette option avant de l'avoir testée avant.
75> .
76> .TP
77diff -r main/libao2/ao_alsa.c main2/libao2/ao_alsa.c
78510c510
79< (unsigned int *)&ao_data.channels)) < 0)
80---
81> &ao_data.channels)) < 0)
82518c518
83< (unsigned int *)&ao_data.samplerate, NULL)) < 0)
84---
85> &ao_data.samplerate, NULL)) < 0)
86568c568
87< (unsigned int *)&alsa_fragcount, NULL)) < 0) {
88---
89> &alsa_fragcount, NULL)) < 0) {
90diff -r main/libavcodec/4xm.c main2/libavcodec/4xm.c
91636c636
92< cfrm->data= av_fast_realloc(cfrm->data, (unsigned int *)&cfrm->allocated_size, cfrm->size + data_size + FF_INPUT_BUFFER_PADDING_SIZE);
93---
94> cfrm->data= av_fast_realloc(cfrm->data, &cfrm->allocated_size, cfrm->size + data_size + FF_INPUT_BUFFER_PADDING_SIZE);
95diff -r main/libavcodec/alac.c main2/libavcodec/alac.c
9634a35,50
97> *
98> * Extradata:
99> * 32bit size
100> * 32bit tag (=alac)
101> * 32bit zero?
102> * 32bit max sample per frame
103> * 8bit ?? (zero?)
104> * 8bit sample size
105> * 8bit history mult
106> * 8bit initial history
107> * 8bit kmodifier
108> * 8bit channels?
109> * 16bit ??
110> * 32bit max coded frame size
111> * 32bit bitrate?
112> * 32bit samplerate
113102c118
114< alac->setinfo_7f = *ptr++;
115---
116> alac->setinfo_7f = *ptr++; // channels?
117105c121
118< alac->setinfo_82 = BE_32(ptr);
119---
120> alac->setinfo_82 = BE_32(ptr); // max coded frame size
121107c123
122< alac->setinfo_86 = BE_32(ptr);
123---
124> alac->setinfo_86 = BE_32(ptr); // bitrate ?
125109c125
126< alac->setinfo_8a_rate = BE_32(ptr);
127---
128> alac->setinfo_8a_rate = BE_32(ptr); // samplerate
129447c463
130< av_log(NULL, AV_LOG_ERROR, "alac: expected %d extradata bytes\n",
131---
132> av_log(avctx, AV_LOG_ERROR, "alac: expected %d extradata bytes\n",
133503c519
134< /* skip 16 bits, not sure what they are. seem to be used in
135---
136> /* FIXME: skip 16 bits, not sure what they are. seem to be used in
137523c539
138< av_log(NULL, AV_LOG_ERROR, "FIXME: unimplemented, unhandling of wasted_bytes\n");
139---
140> av_log(avctx, AV_LOG_ERROR, "FIXME: unimplemented, unhandling of wasted_bytes\n");
141545c561
142< av_log(NULL, AV_LOG_ERROR, "FIXME: unhandled prediction type: %i\n", prediction_type);
143---
144> av_log(avctx, AV_LOG_ERROR, "FIXME: unhandled prediction type: %i\n", prediction_type);
145597c613
146< av_log(NULL, AV_LOG_ERROR, "FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
147---
148> av_log(avctx, AV_LOG_ERROR, "FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
149682c698
150< av_log(NULL, AV_LOG_ERROR, "FIXME: unimplemented, unhandling of wasted_bytes\n");
151---
152> av_log(avctx, AV_LOG_ERROR, "FIXME: unimplemented, unhandling of wasted_bytes\n");
153706c722
154< av_log(NULL, AV_LOG_ERROR, "FIXME: unhandled prediction type: %i\n", prediction_type_a);
155---
156> av_log(avctx, AV_LOG_ERROR, "FIXME: unhandled prediction type: %i\n", prediction_type_a);
157729c745
158< av_log(NULL, AV_LOG_ERROR, "FIXME: unhandled prediction type: %i\n", prediction_type_b);
159---
160> av_log(avctx, AV_LOG_ERROR, "FIXME: unhandled prediction type: %i\n", prediction_type_b);
161785c801
162< av_log(NULL, AV_LOG_ERROR, "FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
163---
164> av_log(avctx, AV_LOG_ERROR, "FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
165diff -r main/libavcodec/CVS/Entries main2/libavcodec/CVS/Entries
16613c13
167< /alac.c/1.9/Sat Jan 28 16:05:06 2006//
168---
169> /alac.c/1.10/Tue Feb 21 00:03:10 2006//
170175c175
171< /x264.c/1.17/Tue Jan 24 10:33:14 2006//
172---
173> /x264.c/1.18/Mon Feb 20 19:01:29 2006//
174181c181
175< /zmbv.c/1.2/Sun Feb 12 17:47:30 2006//
176---
177> /zmbv.c/1.3/Mon Feb 20 23:22:02 2006//
178diff -r main/libavcodec/cyuv.c main2/libavcodec/cyuv.c
17944c44
180< unsigned int width, height;
181---
182> int width, height;
18378,80c78,80
184< unsigned char *y_table = buf + 0;
185< unsigned char *u_table = buf + 16;
186< unsigned char *v_table = buf + 32;
187---
188> signed char *y_table = buf + 0;
189> signed char *u_table = buf + 16;
190> signed char *v_table = buf + 32;
191diff -r main/libavcodec/h263.c main2/libavcodec/h263.c
1922375,2376c2375,2376
193< ff_write_quant_matrix(&s->pb, (int16_t *)(s->avctx->intra_matrix));
194< ff_write_quant_matrix(&s->pb, (int16_t *)(s->avctx->inter_matrix));
195---
196> ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix);
197> ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix);
198diff -r main/libavcodec/h264.c main2/libavcodec/h264.c
1997019c7019
200< e= sscanf((char*)user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &build);
201---
202> e= sscanf(user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &build);
203Seulement dans main/libavcodec/libpostproc: libpostproc.a
204Seulement dans main/libavcodec/libpostproc: postprocess.o
205diff -r main/libavcodec/mjpeg.c main2/libavcodec/mjpeg.c
2061801c1801
207< if (!strcmp((char *)cbuf, "AVID"))
208---
209> if (!strcmp(cbuf, "AVID"))
2101807c1807
211< else if(!strcmp((char *)cbuf, "CS=ITU601")){
212---
213> else if(!strcmp(cbuf, "CS=ITU601")){
214diff -r main/libavcodec/mpeg12.c main2/libavcodec/mpeg12.c
215317,318c317,318
216< ff_write_quant_matrix(&s->pb, (int16_t*)(s->avctx->intra_matrix));
217< ff_write_quant_matrix(&s->pb, (int16_t*)(s->avctx->inter_matrix));
218---
219> ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix);
220> ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix);
2212692c2692
222< buf = ff_find_start_code(buf, s->gb.buffer_end, (uint32_t *)&start_code);
223---
224> buf = ff_find_start_code(buf, s->gb.buffer_end, &start_code);
2253059c3059
226< buf_ptr = ff_find_start_code(buf_ptr,buf_end, (uint32_t*)&start_code);
227---
228> buf_ptr = ff_find_start_code(buf_ptr,buf_end, &start_code);
229diff -r main/libavcodec/mpegaudiodec.c main2/libavcodec/mpegaudiodec.c
2302443c2443
231< window, (int *)&s->dither_state,
232---
233> window, &s->dither_state,
234diff -r main/libavcodec/mpegvideo.c main2/libavcodec/mpegvideo.c
2352233c2233
236< img_resample(resample, (int *)&input[i], (int *)&pre_input);
237---
238> img_resample(resample, &input[i], &pre_input);
239diff -r main/libavcodec/parser.c main2/libavcodec/parser.c
240317c317
241< buf= ff_find_start_code(buf, buf_end, (uint32_t *)&start_code);
242---
243> buf= ff_find_start_code(buf, buf_end, &start_code);
244diff -r main/libavcodec/pnm.c main2/libavcodec/pnm.c
245305c305
246< snprintf((char *)s->bytestream, s->bytestream_end - s->bytestream,
247---
248> snprintf(s->bytestream, s->bytestream_end - s->bytestream,
249308c308
250< s->bytestream += strlen((char *)s->bytestream);
251---
252> s->bytestream += strlen(s->bytestream);
253310c310
254< snprintf((char *)s->bytestream, s->bytestream_end - s->bytestream,
255---
256> snprintf(s->bytestream, s->bytestream_end - s->bytestream,
257312c312
258< s->bytestream += strlen((char *)s->bytestream);
259---
260> s->bytestream += strlen(s->bytestream);
261391c391
262< snprintf((char *)s->bytestream, s->bytestream_end - s->bytestream,
263---
264> snprintf(s->bytestream, s->bytestream_end - s->bytestream,
265394c394
266< s->bytestream += strlen((char *)s->bytestream);
267---
268> s->bytestream += strlen(s->bytestream);
269diff -r main/libavcodec/ra144.c main2/libavcodec/ra144.c
270144c144
271< if (a) rotate_block((short *)glob->buffer_2,(short *)glob->buffer_a,a);
272---
273> if (a) rotate_block(glob->buffer_2,glob->buffer_a,a);
274149c149
275< if (a) g=irms((short *)glob->buffer_a,glob->gval)>>12;
276---
277> if (a) g=irms(glob->buffer_a,glob->gval)>>12;
278151c151
279< add_wav(glob,d,a,g,e,f,(short *)glob->buffer_a,(short *)glob->buffer_b,(short *)glob->buffer_c,(short *)glob->buffer_d);
280---
281> add_wav(glob,d,a,g,e,f,glob->buffer_a,glob->buffer_b,glob->buffer_c,glob->buffer_d);
282154c154
283< final(glob,(short *)glob->gsp,(short *)glob->buffer_d,glob->output_buffer,(int *)glob->buffer,BLOCKSIZE);
284---
285> final(glob,glob->gsp,glob->buffer_d,glob->output_buffer,glob->buffer,BLOCKSIZE);
286453c453
287< do_voice((int *)glob->swapbuf1,(int *)glob->swapbuf2);
288---
289> do_voice(glob->swapbuf1,glob->swapbuf2);
290459c459
291< dec1(glob,(int *)glob->swapbuf1,(int *)glob->swapbuf2,3,glob->val);
292---
293> dec1(glob,glob->swapbuf1,glob->swapbuf2,3,glob->val);
294463c463
295< dec2(glob,(int *)glob->swapbuf1,(int *)glob->swapbuf2,3,a,(int *)glob->swapbuf2alt,c);
296---
297> dec2(glob,glob->swapbuf1,glob->swapbuf2,3,a,glob->swapbuf2alt,c);
298465c465
299< dec2(glob,(int *)glob->swapbuf1alt,(int *)glob->swapbuf2alt,3,a,(int *)glob->swapbuf2,c);
300---
301> dec2(glob,glob->swapbuf1alt,glob->swapbuf2alt,3,a,glob->swapbuf2,c);
302469c469
303< dec2(glob,(int *)glob->swapbuf1alt,(int *)glob->swapbuf2alt,3,glob->oldval,(int *)glob->swapbuf2,c);
304---
305> dec2(glob,glob->swapbuf1alt,glob->swapbuf2alt,3,glob->oldval,glob->swapbuf2,c);
306471c471
307< dec2(glob,(int *)glob->swapbuf1,(int *)glob->swapbuf2,3,glob->val,(int *)glob->swapbuf2alt,c);
308---
309> dec2(glob,glob->swapbuf1,glob->swapbuf2,3,glob->val,glob->swapbuf2alt,c);
310diff -r main/libavcodec/svq1.c main2/libavcodec/svq1.c
311660c660
312< svq1_parse_string (bitbuf, (unsigned char *) msg);
313---
314> svq1_parse_string (bitbuf, (char *) msg);
315diff -r main/libavcodec/x264.c main2/libavcodec/x264.c
316224a225
317> x4->params.analyse.i_noise_reduction = avctx->noise_reduction;
318diff -r main/libavcodec/zmbv.c main2/libavcodec/zmbv.c
319152a153,226
320> * Decode XOR'ed frame - 15bpp and 16bpp version
321> */
322>
323> static int zmbv_decode_xor_16(ZmbvContext *c)
324> {
325> uint8_t *src = c->decomp_buf;
326> uint16_t *output, *prev;
327> int8_t *mvec;
328> int x, y;
329> int d, dx, dy, bw2, bh2;
330> int block;
331> int i, j;
332> int mx, my;
333>
334> output = (uint16_t*)c->cur;
335> prev = (uint16_t*)c->prev;
336>
337> mvec = (int8_t*)src;
338> src += ((c->bx * c->by * 2 + 3) & ~3);
339>
340> block = 0;
341> for(y = 0; y < c->height; y += c->bh) {
342> bh2 = ((c->height - y) > c->bh) ? c->bh : (c->height - y);
343> for(x = 0; x < c->width; x += c->bw) {
344> uint16_t *out, *tprev;
345>
346> d = mvec[block] & 1;
347> dx = mvec[block] >> 1;
348> dy = mvec[block + 1] >> 1;
349> block += 2;
350>
351> bw2 = ((c->width - x) > c->bw) ? c->bw : (c->width - x);
352>
353> /* copy block - motion vectors out of bounds are used to zero blocks */
354> out = output + x;
355> tprev = prev + x + dx + dy * c->width;
356> mx = x + dx;
357> my = y + dy;
358> for(j = 0; j < bh2; j++){
359> if((my + j < 0) || (my + j >= c->height)) {
360> memset(out, 0, bw2 * 2);
361> } else {
362> for(i = 0; i < bw2; i++){
363> if((mx + i < 0) || (mx + i >= c->width))
364> out[i] = 0;
365> else
366> out[i] = tprev[i];
367> }
368> }
369> out += c->width;
370> tprev += c->width;
371> }
372>
373> if(d) { /* apply XOR'ed difference */
374> out = output + x;
375> for(j = 0; j < bh2; j++){
376> for(i = 0; i < bw2; i++) {
377> out[i] ^= *((uint16_t*)src);
378> src += 2;
379> }
380> out += c->width;
381> }
382> }
383> }
384> output += c->width * c->bh;
385> prev += c->width * c->bh;
386> }
387> if(src - c->decomp_buf != c->decomp_len)
388> av_log(c->avctx, AV_LOG_ERROR, "Used %i of %i bytes\n", src-c->decomp_buf, c->decomp_len);
389> return 0;
390> }
391>
392> #ifdef ZMBV_ENABLE_24BPP
393> /**
394231a306,379
395> #endif //ZMBV_ENABLE_24BPP
396>
397> /**
398> * Decode XOR'ed frame - 32bpp version
399> */
400>
401> static int zmbv_decode_xor_32(ZmbvContext *c)
402> {
403> uint8_t *src = c->decomp_buf;
404> uint32_t *output, *prev;
405> int8_t *mvec;
406> int x, y;
407> int d, dx, dy, bw2, bh2;
408> int block;
409> int i, j;
410> int mx, my;
411>
412> output = (uint32_t*)c->cur;
413> prev = (uint32_t*)c->prev;
414>
415> mvec = (int8_t*)src;
416> src += ((c->bx * c->by * 2 + 3) & ~3);
417>
418> block = 0;
419> for(y = 0; y < c->height; y += c->bh) {
420> bh2 = ((c->height - y) > c->bh) ? c->bh : (c->height - y);
421> for(x = 0; x < c->width; x += c->bw) {
422> uint32_t *out, *tprev;
423>
424> d = mvec[block] & 1;
425> dx = mvec[block] >> 1;
426> dy = mvec[block + 1] >> 1;
427> block += 2;
428>
429> bw2 = ((c->width - x) > c->bw) ? c->bw : (c->width - x);
430>
431> /* copy block - motion vectors out of bounds are used to zero blocks */
432> out = output + x;
433> tprev = prev + x + dx + dy * c->width;
434> mx = x + dx;
435> my = y + dy;
436> for(j = 0; j < bh2; j++){
437> if((my + j < 0) || (my + j >= c->height)) {
438> memset(out, 0, bw2 * 4);
439> } else {
440> for(i = 0; i < bw2; i++){
441> if((mx + i < 0) || (mx + i >= c->width))
442> out[i] = 0;
443> else
444> out[i] = tprev[i];
445> }
446> }
447> out += c->width;
448> tprev += c->width;
449> }
450>
451> if(d) { /* apply XOR'ed difference */
452> out = output + x;
453> for(j = 0; j < bh2; j++){
454> for(i = 0; i < bw2; i++) {
455> out[i] ^= *((uint32_t*)src);
456> src += 4;
457> }
458> out += c->width;
459> }
460> }
461> }
462> output += c->width * c->bh;
463> prev += c->width * c->bh;
464> }
465> if(src - c->decomp_buf != c->decomp_len)
466> av_log(c->avctx, AV_LOG_ERROR, "Used %i of %i bytes\n", src-c->decomp_buf, c->decomp_len);
467> return 0;
468> }
469297c445,472
470< if(c->fmt != ZMBV_FMT_8BPP && c->fmt != ZMBV_FMT_24BPP) {
471---
472>
473> switch(c->fmt) {
474> case ZMBV_FMT_8BPP:
475> c->bpp = 8;
476> c->decode_intra = zmbv_decode_intra;
477> c->decode_xor = zmbv_decode_xor_8;
478> break;
479> case ZMBV_FMT_15BPP:
480> case ZMBV_FMT_16BPP:
481> c->bpp = 16;
482> c->decode_intra = zmbv_decode_intra;
483> c->decode_xor = zmbv_decode_xor_16;
484> break;
485> #ifdef ZMBV_ENABLE_24BPP
486> case ZMBV_FMT_24BPP:
487> c->bpp = 24;
488> c->decode_intra = zmbv_decode_intra;
489> c->decode_xor = zmbv_decode_xor_24;
490> break;
491> #endif //ZMBV_ENABLE_24BPP
492> case ZMBV_FMT_32BPP:
493> c->bpp = 32;
494> c->decode_intra = zmbv_decode_intra;
495> c->decode_xor = zmbv_decode_xor_32;
496> break;
497> default:
498> c->decode_intra = NULL;
499> c->decode_xor = NULL;
500311,319d485
501< if(c->fmt == ZMBV_FMT_8BPP) {
502< c->bpp = 8;
503< c->decode_intra = zmbv_decode_intra;
504< c->decode_xor = zmbv_decode_xor_8;
505< } else {
506< c->bpp = 24;
507< c->decode_intra = zmbv_decode_intra;
508< c->decode_xor = zmbv_decode_xor_24;
509< }
510326c492
511< if(c->fmt == 0) {
512---
513> if(c->decode_intra == NULL) {
514365,370c531,585
515< for(j = 0; j < c->height; j++) {
516< for(i = 0; i < c->width; i++) {
517< out[i * 3 + 0] = c->pal[(*src) * 3 + 0];
518< out[i * 3 + 1] = c->pal[(*src) * 3 + 1];
519< out[i * 3 + 2] = c->pal[(*src) * 3 + 2];
520< *src++;
521---
522> switch(c->fmt) {
523> case ZMBV_FMT_8BPP:
524> for(j = 0; j < c->height; j++) {
525> for(i = 0; i < c->width; i++) {
526> out[i * 3 + 0] = c->pal[(*src) * 3 + 0];
527> out[i * 3 + 1] = c->pal[(*src) * 3 + 1];
528> out[i * 3 + 2] = c->pal[(*src) * 3 + 2];
529> *src++;
530> }
531> out += c->pic.linesize[0];
532> }
533> break;
534> case ZMBV_FMT_15BPP:
535> for(j = 0; j < c->height; j++) {
536> for(i = 0; i < c->width; i++) {
537> uint16_t tmp = LE_16(src);
538> src += 2;
539> out[i * 3 + 0] = (tmp & 0x7C00) >> 7;
540> out[i * 3 + 1] = (tmp & 0x03E0) >> 2;
541> out[i * 3 + 2] = (tmp & 0x001F) << 3;
542> }
543> out += c->pic.linesize[0];
544> }
545> break;
546> case ZMBV_FMT_16BPP:
547> for(j = 0; j < c->height; j++) {
548> for(i = 0; i < c->width; i++) {
549> uint16_t tmp = LE_16(src);
550> src += 2;
551> out[i * 3 + 0] = (tmp & 0xF800) >> 8;
552> out[i * 3 + 1] = (tmp & 0x07E0) >> 3;
553> out[i * 3 + 2] = (tmp & 0x001F) << 3;
554> }
555> out += c->pic.linesize[0];
556> }
557> break;
558> #ifdef ZMBV_ENABLE_24BPP
559> case ZMBV_FMT_24BPP:
560> for(j = 0; j < c->height; j++) {
561> memcpy(out, src, c->width * 3);
562> src += c->width * 3;
563> out += c->pic.linesize[0];
564> }
565> break;
566> #endif //ZMBV_ENABLE_24BPP
567> case ZMBV_FMT_32BPP:
568> for(j = 0; j < c->height; j++) {
569> for(i = 0; i < c->width; i++) {
570> uint32_t tmp = LE_32(src);
571> src += 4;
572> out[i * 3 + 0] = tmp >> 16;
573> out[i * 3 + 1] = tmp >> 8;
574> out[i * 3 + 2] = tmp >> 0;
575> }
576> out += c->pic.linesize[0];
577372c587,589
578< out += c->pic.linesize[0];
579---
580> break;
581> default:
582> av_log(avctx, AV_LOG_ERROR, "Cannot handle format %i\n", c->fmt);
583374c591
584< memcpy(c->prev, c->cur, c->width * c->height);
585---
586> memcpy(c->prev, c->cur, c->width * c->height * (c->bpp / 8));
587diff -r main/libavformat/avienc.c main2/libavformat/avienc.c
588479c479
589< put_tag(pb, (char *)avi_stream2fourcc(&tag[0], i, stream->codec_type));
590---
591> put_tag(pb, avi_stream2fourcc(&tag[0], i, stream->codec_type));
592534c534
593< put_tag(pb, (char *)&ix_tag[0]); /* ix?? */
594---
595> put_tag(pb, &ix_tag[0]); /* ix?? */
596542c542
597< put_tag(pb, (char *)&tag[0]); /* dwChunkId */
598---
599> put_tag(pb, &tag[0]); /* dwChunkId */
600602c602
601< put_tag(pb, (char *)&tag[0]);
602---
603> put_tag(pb, &tag[0]);
604diff -r main/libavformat/aviobuf.c main2/libavformat/aviobuf.c
605589c589
606< put_buffer(s, (unsigned char *)buf, strlen(buf));
607---
608> put_buffer(s, buf, strlen(buf));
609diff -r main/libavformat/crc.c main2/libavformat/crc.c
61088c88
611< put_buffer(&s->pb, (unsigned char *)buf, strlen(buf));
612---
613> put_buffer(&s->pb, buf, strlen(buf));
61499c99
615< put_buffer(&s->pb, (unsigned char *)buf, strlen(buf));
616---
617> put_buffer(&s->pb, buf, strlen(buf));
618diff -r main/libavformat/flvdec.c main2/libavformat/flvdec.c
61990c90
620< get_buffer(&s->pb, (unsigned char *)tmp, len);
621---
622> get_buffer(&s->pb, tmp, len);
623diff -r main/libavformat/ipmovie.c main2/libavformat/ipmovie.c
624510c510
625< if (strncmp((char *)p->buf, IPMOVIE_SIGNATURE, IPMOVIE_SIGNATURE_SIZE) != 0)
626---
627> if (strncmp(p->buf, IPMOVIE_SIGNATURE, IPMOVIE_SIGNATURE_SIZE) != 0)
628diff -r main/libavformat/matroska.c main2/libavformat/matroska.c
6291659c1659
630< (uint64_t *)&time)) < 0)
631---
632> &time)) < 0)
633diff -r main/libavformat/mmf.c main2/libavformat/mmf.c
63462c62
635< unsigned int rate;
636---
637> int rate;
63881c81
639< put_buffer(pb, (unsigned char*)"ATR\x00", 4);
640---
641> put_buffer(pb, "ATR\x00", 4);
64295c95
643< put_buffer(pb, (unsigned char*)"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16);
644---
645> put_buffer(pb, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16);
646152c152
647< put_buffer(pb, (unsigned char*)"\xff\x00", 2); /* nop */
648---
649> put_buffer(pb, "\xff\x00", 2); /* nop */
650155c155
651< put_buffer(pb, (unsigned char*)"\x00\x00\x00\x00", 4);
652---
653> put_buffer(pb, "\x00\x00\x00\x00", 4);
654diff -r main/libavformat/movenc.c main2/libavformat/movenc.c
655517c517
656< put_buffer(pb, (unsigned char *)compressor_name, 31);
657---
658> put_buffer(pb, compressor_name, 31);
659640c640
660< put_buffer(pb, (unsigned char *)hdlr, 4); /* handler */
661---
662> put_buffer(pb, hdlr, 4); /* handler */
663646c646
664< put_buffer(pb, (unsigned char *)descr, strlen(descr)); /* handler description */
665---
666> put_buffer(pb, descr, strlen(descr)); /* handler description */
667877c877
668< put_buffer(pb, (unsigned char *)data, strlen(data));
669---
670> put_buffer(pb, data, strlen(data));
6711087c1087
672< put_buffer(pb, (unsigned char *)"QuickTime 6.0 or greater",
673---
674> put_buffer(pb, "QuickTime 6.0 or greater",
6751102c1102
676< put_buffer(pb, (unsigned char *)LIBAVFORMAT_IDENT, sizeof(LIBAVFORMAT_IDENT) - 1);
677---
678> put_buffer(pb, LIBAVFORMAT_IDENT, sizeof(LIBAVFORMAT_IDENT) - 1);
6791113c1113
680< put_buffer(pb, (unsigned char *)s->title, strlen(s->title));
681---
682> put_buffer(pb, s->title, strlen(s->title));
6831124c1124
684< put_buffer(pb, (unsigned char *)s->author, strlen(s->author));
685---
686> put_buffer(pb, s->author, strlen(s->author));
6871135c1135
688< put_buffer(pb, (unsigned char *)s->comment, strlen(s->comment));
689---
690> put_buffer(pb, s->comment, strlen(s->comment));
691diff -r main/libavformat/mp3.c main2/libavformat/mp3.c
692219,221c219,221
693< strncpy((char *)buf + 3, s->title, 30);
694< strncpy((char *)buf + 33, s->author, 30);
695< strncpy((char *)buf + 63, s->album, 30);
696---
697> strncpy(buf + 3, s->title, 30);
698> strncpy(buf + 33, s->author, 30);
699> strncpy(buf + 63, s->album, 30);
700229c229
701< strncpy((char *)buf + 97, s->comment, 30);
702---
703> strncpy(buf + 97, s->comment, 30);
704diff -r main/libavformat/mpeg.c main2/libavformat/mpeg.c
7051431c1431
706< startcode = find_next_start_code(&s->pb, &size, (uint32_t *)(&m->header_state));
707---
708> startcode = find_next_start_code(&s->pb, &size, &m->header_state);
709diff -r main/libavformat/mpjpeg.c main2/libavformat/mpjpeg.c
71030,31c30,31
711< snprintf((char *)buf1, sizeof(buf1), "--%s\n", BOUNDARY_TAG);
712< put_buffer(&s->pb, buf1, strlen((char *)buf1));
713---
714> snprintf(buf1, sizeof(buf1), "--%s\n", BOUNDARY_TAG);
715> put_buffer(&s->pb, buf1, strlen(buf1));
71640,41c40,41
717< snprintf((char *)buf1, sizeof(buf1), "Content-type: image/jpeg\n\n");
718< put_buffer(&s->pb, buf1, strlen((char *)buf1));
719---
720> snprintf(buf1, sizeof(buf1), "Content-type: image/jpeg\n\n");
721> put_buffer(&s->pb, buf1, strlen(buf1));
72244,45c44,45
723< snprintf((char *)buf1, sizeof(buf1), "\n--%s\n", BOUNDARY_TAG);
724< put_buffer(&s->pb, buf1, strlen((char *)buf1));
725---
726> snprintf(buf1, sizeof(buf1), "\n--%s\n", BOUNDARY_TAG);
727> put_buffer(&s->pb, buf1, strlen(buf1));
728diff -r main/libavformat/nsvdec.c main2/libavformat/nsvdec.c
729325c325
730< get_buffer(pb, (unsigned char *)strings, strings_size);
731---
732> get_buffer(pb, strings, strings_size);
733diff -r main/libavformat/nut.c main2/libavformat/nut.c
734263c263
735< get_buffer(bc, (unsigned char*)string, FFMIN(len, maxlen));
736---
737> get_buffer(bc, string, FFMIN(len, maxlen));
738427c427
739< put_buffer(bc, (unsigned char*)string, len);
740---
741> put_buffer(bc, string, len);
742528c528
743< put_buffer(bc, (unsigned char*)ID_STRING, strlen(ID_STRING));
744---
745> put_buffer(bc, ID_STRING, strlen(ID_STRING));
746diff -r main/libavformat/ogg2.c main2/libavformat/ogg2.c
747223c223
748< if (get_buffer (bc, (unsigned char *)sync, 4) < 4)
749---
750> if (get_buffer (bc, sync, 4) < 4)
751diff -r main/libavformat/oggparseflac.c main2/libavformat/oggparseflac.c
75267c67
753< vorbis_comment (s, (char *)(os->buf + os->pstart + 4), (int)((unsigned *)os->psize - 4));
754---
755> vorbis_comment (s, os->buf + os->pstart + 4, os->psize - 4);
75674c74
757< .magic = (unsigned char*)"\177FLAC",
758---
759> .magic = "\177FLAC",
760diff -r main/libavformat/oggparsetheora.c main2/libavformat/oggparsetheora.c
76183c83
762< vorbis_comment (s, (char *)os->buf + os->pstart + 7, os->psize - 8);
763---
764> vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
765diff -r main/libavformat/oggparsevorbis.c main2/libavformat/oggparsevorbis.c
766190c190
767< vorbis_comment (s, (char *)os->buf + os->pstart + 7, os->psize - 8);
768---
769> vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
770200c200
771< .magic = (unsigned char *)"\001vorbis",
772---
773> .magic = "\001vorbis",
774diff -r main/libavformat/pnm.c main2/libavformat/pnm.c
775192c192
776< put_buffer(pb, (unsigned char *)buf, strlen(buf));
777---
778> put_buffer(pb, buf, strlen(buf));
779196c196
780< put_buffer(pb, (unsigned char *)buf, strlen(buf));
781---
782> put_buffer(pb, buf, strlen(buf));
783362c362
784< put_buffer(pb, (unsigned char *)buf, strlen(buf));
785---
786> put_buffer(pb, buf, strlen(buf));
787393c393
788< const unsigned char *p = pd->buf;
789---
790> const char *p = pd->buf;
791413c413
792< const unsigned char *p = pd->buf;
793---
794> const char *p = pd->buf;
795diff -r main/libavformat/sgi.c main2/libavformat/sgi.c
796420c420
797< lengthtab[(z * si->ysize) + y] = rle_row(pb, (char *)srcrow,
798---
799> lengthtab[(z * si->ysize) + y] = rle_row(pb, srcrow,
800diff -r main/libavformat/utils.c main2/libavformat/utils.c
8011143c1143
802< (unsigned int *)&st->index_entries_allocated_size,
803---
804> &st->index_entries_allocated_size,
805diff -r main/libavformat/wc3movie.c main2/libavformat/wc3movie.c
806185c185
807< if ((ret = get_buffer(pb, (unsigned char*)s->title, bytes_to_read)) != bytes_to_read)
808---
809> if ((ret = get_buffer(pb, s->title, bytes_to_read)) != bytes_to_read)
810diff -r main/libavformat/yuv4mpeg.c main2/libavformat/yuv4mpeg.c
811108c108
812< put_buffer(pb, (unsigned char *)buf2, strlen(buf2));
813---
814> put_buffer(pb, buf2, strlen(buf2));
815115c115
816< put_buffer(pb, (unsigned char *)buf1, strlen(buf1));
817---
818> put_buffer(pb, buf1, strlen(buf1));
819390c390
820< if (strncmp((char *)pd->buf, Y4M_MAGIC, sizeof(Y4M_MAGIC)-1)==0)
821---
822> if (strncmp(pd->buf, Y4M_MAGIC, sizeof(Y4M_MAGIC)-1)==0)
823diff -r main/libmpcodecs/ad_acm.c main2/libmpcodecs/ad_acm.c
82434c34
825< int ret=decode_audio(sh_audio,(unsigned char *)sh_audio->a_buffer,4096,sh_audio->a_buffer_size);
826---
827> int ret=decode_audio(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size);
828204c204
829< demux_read_data(sh_audio->ds,(unsigned char *)&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
830---
831> demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
832diff -r main/libmpcodecs/ad_dk3adpcm.c main2/libmpcodecs/ad_dk3adpcm.c
83398c98
834< demux_read_data(sh_audio->ds, (unsigned char *)sh_audio->a_in_buffer,sh_audio->ds->ss_mul);
835---
836> demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,sh_audio->ds->ss_mul);
837235c235
838< if (demux_read_data(sh_audio->ds, (unsigned char *)sh_audio->a_in_buffer,
839---
840> if (demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,
841245c245
842< (unsigned short*)buf, (unsigned char *)sh_audio->a_in_buffer,
843---
844> (unsigned short*)buf, sh_audio->a_in_buffer,
845diff -r main/libmpcodecs/ad_dmo.c main2/libmpcodecs/ad_dmo.c
84689c89
847< demux_read_data(sh_audio->ds,(unsigned char *)&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
848---
849> demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
85093c93
851< buf,maxlen, (unsigned int *)&size_in,(unsigned int *)&size_out);
852---
853> buf,maxlen, &size_in,&size_out);
854diff -r main/libmpcodecs/ad_dshow.c main2/libmpcodecs/ad_dshow.c
85585c85
856< demux_read_data(sh_audio->ds,(unsigned char *)&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
857---
858> demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
85989c89
860< buf,maxlen, (unsigned int *)&size_in,(unsigned int *)&size_out);
861---
862> buf,maxlen, &size_in,&size_out);
863diff -r main/libmpcodecs/ad_dvdpcm.c main2/libmpcodecs/ad_dvdpcm.c
86497c97
865< len = demux_read_data(sh_audio->ds, (unsigned char *)tmp, 10);
866---
867> len = demux_read_data(sh_audio->ds, tmp, 10);
868121c121
869< len = demux_read_data(sh_audio->ds, (unsigned char *)tmp, 12);
870---
871> len = demux_read_data(sh_audio->ds, tmp, 12);
872diff -r main/libmpcodecs/ad_faad.c main2/libmpcodecs/ad_faad.c
87380c80
874< sh->codecdata = (unsigned char*)(sh->wf+1);
875---
876> sh->codecdata = (char*)(sh->wf+1);
877115,116c115,116
878< sh->a_in_buffer_len = demux_read_data(sh->ds, (unsigned char *)sh->a_in_buffer, sh->a_in_buffer_size);
879< pos = aac_probe((unsigned char *)sh->a_in_buffer, sh->a_in_buffer_len);
880---
881> sh->a_in_buffer_len = demux_read_data(sh->ds, sh->a_in_buffer, sh->a_in_buffer_size);
882> pos = aac_probe(sh->a_in_buffer, sh->a_in_buffer_len);
883121c121
884< demux_read_data(sh->ds,(unsigned char *)&(sh->a_in_buffer[sh->a_in_buffer_len]),
885---
886> demux_read_data(sh->ds,&(sh->a_in_buffer[sh->a_in_buffer_len]),
887127c127
888< faac_init = faacDecInit(faac_hdec, (unsigned char *)sh->a_in_buffer,
889---
890> faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
891181c181
892< demux_read_data(sh->ds,(unsigned char *)&sh->a_in_buffer[sh->a_in_buffer_len],
893---
894> demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len],
895184c184
896< pos = aac_probe((unsigned char *)sh->a_in_buffer, sh->a_in_buffer_len);
897---
898> pos = aac_probe(sh->a_in_buffer, sh->a_in_buffer_len);
899221c221
900< demux_read_data(sh->ds,(unsigned char *)&sh->a_in_buffer[sh->a_in_buffer_len],
901---
902> demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len],
903235c235
904< faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, (unsigned char *)sh->a_in_buffer+j, sh->a_in_buffer_len);
905---
906> faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, sh->a_in_buffer+j, sh->a_in_buffer_len);
907diff -r main/libmpcodecs/ad_ffmpeg.c main2/libmpcodecs/ad_ffmpeg.c
908109c109
909< x=decode_audio(sh_audio,(unsigned char *)sh_audio->a_buffer,1,sh_audio->a_buffer_size);
910---
911> x=decode_audio(sh_audio,sh_audio->a_buffer,1,sh_audio->a_buffer_size);
912diff -r main/libmpcodecs/ad_hwac3.c main2/libmpcodecs/ad_hwac3.c
91362c62
914< length = dts_syncinfo((uint8_t *)sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
915---
916> length = dts_syncinfo(sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
91772c72
918< length = a52_syncinfo((uint8_t *)sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
919---
920> length = a52_syncinfo(sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
92190c90
922< demux_read_data(sh_audio->ds, (unsigned char *)sh_audio->a_in_buffer + 10, length - 10);
923---
924> demux_read_data(sh_audio->ds, sh_audio->a_in_buffer + 10, length - 10);
92594c94
926< if(isdts == 0 && crc16_block((uint8_t *)sh_audio->a_in_buffer + 2, length - 2) != 0)
927---
928> if(isdts == 0 && crc16_block(sh_audio->a_in_buffer + 2, length - 2) != 0)
929157c157
930< return decode_audio_dts((uint8_t *)sh_audio->a_in_buffer, len, buf);
931---
932> return decode_audio_dts(sh_audio->a_in_buffer, len, buf);
933diff -r main/libmpcodecs/ad_hwmpa.c main2/libmpcodecs/ad_hwmpa.c
93441c41
935< x = mp_get_mp3_header((unsigned char *)&(sh->a_in_buffer[cnt]), chans, srate, spf, mpa_layer, br);
936---
937> x = mp_get_mp3_header(&(sh->a_in_buffer[cnt]), chans, srate, spf, mpa_layer, br);
93853c53
939< len = demux_read_data(sh->ds,(unsigned char *)&sh->a_in_buffer[sh->a_in_buffer_len],sh->a_in_buffer_size-sh->a_in_buffer_len);
940---
941> len = demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len],sh->a_in_buffer_size-sh->a_in_buffer_len);
942diff -r main/libmpcodecs/ad_imaadpcm.c main2/libmpcodecs/ad_imaadpcm.c
943126c126
944< demux_read_data(sh_audio->ds, (unsigned char *)sh_audio->a_in_buffer,sh_audio->ds->ss_mul);
945---
946> demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,sh_audio->ds->ss_mul);
947353c353
948< if (demux_read_data(sh_audio->ds, (unsigned char *)sh_audio->a_in_buffer,
949---
950> if (demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,
951361c361
952< (unsigned short*)buf, (unsigned char *)sh_audio->a_in_buffer, sh_audio->wf->nChannels,
953---
954> (unsigned short*)buf, sh_audio->a_in_buffer, sh_audio->wf->nChannels,
955367c367
956< (unsigned short*)buf, (unsigned char *)sh_audio->a_in_buffer, sh_audio->wf->nChannels,
957---
958> (unsigned short*)buf, sh_audio->a_in_buffer, sh_audio->wf->nChannels,
959373c373
960< (unsigned short*)buf, (unsigned char *)sh_audio->a_in_buffer, sh_audio->wf->nChannels);
961---
962> (unsigned short*)buf, sh_audio->a_in_buffer, sh_audio->wf->nChannels);
963diff -r main/libmpcodecs/ad_liba52.c main2/libmpcodecs/ad_liba52.c
96472c72
965< length = a52_syncinfo ((uint8_t *)sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
966---
967> length = a52_syncinfo (sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
96883c83
969< demux_read_data(sh_audio->ds,(unsigned char *)sh_audio->a_in_buffer+8,length-8);
970---
971> demux_read_data(sh_audio->ds,sh_audio->a_in_buffer+8,length-8);
97287c87
973< if(crc16_block((uint8_t *)sh_audio->a_in_buffer+2,length-2)!=0)
974---
975> if(crc16_block(sh_audio->a_in_buffer+2,length-2)!=0)
97698c98
977< a52_syncinfo ((uint8_t *)sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
978---
979> a52_syncinfo (sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
980213c213
981< if (a52_frame (&a52_state, (unsigned char *)sh_audio->a_in_buffer, &flags, &level, bias)){
982---
983> if (a52_frame (&a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){
984300c300
985< if (a52_frame (&a52_state, (unsigned char *)sh_audio->a_in_buffer, &flags, &level, bias)){
986---
987> if (a52_frame (&a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){
988diff -r main/libmpcodecs/ad_libvorbis.c main2/libmpcodecs/ad_libvorbis.c
98992c92
990< extradata = (unsigned char*) (sh->wf+1);
991---
992> extradata = (char*) (sh->wf+1);
993diff -r main/libmpcodecs/ad_mp3lib.c main2/libmpcodecs/ad_mp3lib.c
99429c29
995< return demux_read_data(dec_audio_sh->ds,(unsigned char *)buf,size);
996---
997> return demux_read_data(dec_audio_sh->ds,buf,size);
99849c49
999< sh->a_buffer_len=MP3_DecodeFrame((unsigned char *)sh->a_buffer,-1);
1000---
1001> sh->a_buffer_len=MP3_DecodeFrame(sh->a_buffer,-1);
1002diff -r main/libmpcodecs/ad_msadpcm.c main2/libmpcodecs/ad_msadpcm.c
100393c93
1004< demux_read_data(sh_audio->ds, (unsigned char *)sh_audio->a_in_buffer,sh_audio->ds->ss_mul);
1005---
1006> demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,sh_audio->ds->ss_mul);
1007208c208
1008< if (demux_read_data(sh_audio->ds, (unsigned char *)sh_audio->a_in_buffer,
1009---
1010> if (demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,
1011214c214
1012< (unsigned short*)buf, (unsigned char *)sh_audio->a_in_buffer,
1013---
1014> (unsigned short*)buf, sh_audio->a_in_buffer,
1015diff -r main/libmpcodecs/ad_qtaudio.c main2/libmpcodecs/ad_qtaudio.c
1016307c307
1017< int x=demux_read_data(sh->ds,(unsigned char *)&sh->a_in_buffer[sh->a_in_buffer_len],
1018---
1019> int x=demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len],
1020diff -r main/libmpcodecs/ad_realaud.c main2/libmpcodecs/ad_realaud.c
1021415c415
1022< demux_read_data(sh->ds, (unsigned char *)sh->a_in_buffer, sh->wf->nBlockAlign);
1023---
1024> demux_read_data(sh->ds, sh->a_in_buffer, sh->wf->nBlockAlign);
1025422,423c422,423
1026< result=wraDecode(sh->context, (char *)sh->a_in_buffer+sh->a_in_buffer_size-sh->a_in_buffer_len, sh->wf->nBlockAlign,
1027< (char *)buf, (unsigned int *)&len, -1);
1028---
1029> result=wraDecode(sh->context, sh->a_in_buffer+sh->a_in_buffer_size-sh->a_in_buffer_len, sh->wf->nBlockAlign,
1030> buf, &len, -1);
1031426,427c426,427
1032< result=raDecode(sh->context, (char *)sh->a_in_buffer+sh->a_in_buffer_size-sh->a_in_buffer_len, sh->wf->nBlockAlign,
1033< (char *)buf, (unsigned int *)&len, -1);
1034---
1035> result=raDecode(sh->context, sh->a_in_buffer+sh->a_in_buffer_size-sh->a_in_buffer_len, sh->wf->nBlockAlign,
1036> buf, &len, -1);
1037diff -r main/libmpcodecs/ad_twin.c main2/libmpcodecs/ad_twin.c
1038215c215
1039< priv->nbuf = demux_read_data(sh->ds, (unsigned char *)priv->buf, BBUFSIZ);
1040---
1041> priv->nbuf = demux_read_data(sh->ds, priv->buf, BBUFSIZ);
1042diff -r main/libmpcodecs/dec_audio.c main2/libmpcodecs/dec_audio.c
1043139c139
1044< (unsigned int *)(sh_audio->wf?(&i):NULL), sh_audio->codec, force) )) break;
1045---
1046> sh_audio->wf?(&i):NULL, sh_audio->codec, force) )) break;
1047381c381
1048< (unsigned char *)(sh_audio->a_buffer+sh_audio->a_buffer_len), len, maxlen);
1049---
1050> sh_audio->a_buffer+sh_audio->a_buffer_len, len, maxlen);
1051diff -r main/libmpcodecs/native/RTjpegN.c main2/libmpcodecs/native/RTjpegN.c
10522885c2885
1053< RTjpeg_dctY((unsigned char *)bp1+j, RTjpeg_block, RTjpeg_Ywidth);
1054---
1055> RTjpeg_dctY(bp1+j, RTjpeg_block, RTjpeg_Ywidth);
10562889c2889
1057< RTjpeg_dctY((unsigned char *)bp1+j+8, RTjpeg_block, RTjpeg_Ywidth);
1058---
1059> RTjpeg_dctY(bp1+j+8, RTjpeg_block, RTjpeg_Ywidth);
10602893c2893
1061< RTjpeg_dctY((unsigned char *)bp2+k, RTjpeg_block, RTjpeg_Cwidth);
1062---
1063> RTjpeg_dctY(bp2+k, RTjpeg_block, RTjpeg_Cwidth);
10642897c2897
1065< RTjpeg_dctY((unsigned char *)bp3+k, RTjpeg_block, RTjpeg_Cwidth);
1066---
1067> RTjpeg_dctY(bp3+k, RTjpeg_block, RTjpeg_Cwidth);
10682938c2938
1069< RTjpeg_dctY((unsigned char *)bp2+k, RTjpeg_block, RTjpeg_Cwidth);
1070---
1071> RTjpeg_dctY(bp2+k, RTjpeg_block, RTjpeg_Cwidth);
10722942c2942
1073< RTjpeg_dctY((unsigned char *)bp3+k, RTjpeg_block, RTjpeg_Cwidth);
1074---
1075> RTjpeg_dctY(bp3+k, RTjpeg_block, RTjpeg_Cwidth);
10763016c3016
1077< RTjpeg_idct((unsigned char *)bp2+k, RTjpeg_block, RTjpeg_width>>1);
1078---
1079> RTjpeg_idct(bp2+k, RTjpeg_block, RTjpeg_width>>1);
10803022c3022
1081< RTjpeg_idct((unsigned char *)bp3+k, RTjpeg_block, RTjpeg_width>>1);
1082---
1083> RTjpeg_idct(bp3+k, RTjpeg_block, RTjpeg_width>>1);
10843065c3065
1085< RTjpeg_idct((unsigned char *)bp1+j, RTjpeg_block, RTjpeg_width);
1086---
1087> RTjpeg_idct(bp1+j, RTjpeg_block, RTjpeg_width);
10883071c3071
1089< RTjpeg_idct((unsigned char *)bp1+j+8, RTjpeg_block, RTjpeg_width);
1090---
1091> RTjpeg_idct(bp1+j+8, RTjpeg_block, RTjpeg_width);
10923077c3077
1093< RTjpeg_idct((unsigned char *)bp2+k, RTjpeg_block, RTjpeg_width>>1);
1094---
1095> RTjpeg_idct(bp2+k, RTjpeg_block, RTjpeg_width>>1);
10963083c3083
1097< RTjpeg_idct((unsigned char *)bp3+k, RTjpeg_block, RTjpeg_width>>1);
1098---
1099> RTjpeg_idct(bp3+k, RTjpeg_block, RTjpeg_width>>1);
11003256c3256
1101< RTjpeg_dctY((unsigned char *)bp1+j, RTjpeg_block, RTjpeg_Ywidth);
1102---
1103> RTjpeg_dctY(bp1+j, RTjpeg_block, RTjpeg_Ywidth);
11043265c3265
1105< RTjpeg_dctY((unsigned char *)bp1+j+8, RTjpeg_block, RTjpeg_Ywidth);
1106---
1107> RTjpeg_dctY(bp1+j+8, RTjpeg_block, RTjpeg_Ywidth);
11083274c3274
1109< RTjpeg_dctY((unsigned char *)bp2+k, RTjpeg_block, RTjpeg_Cwidth);
1110---
1111> RTjpeg_dctY(bp2+k, RTjpeg_block, RTjpeg_Cwidth);
11123283c3283
1113< RTjpeg_dctY((unsigned char *)bp3+k, RTjpeg_block, RTjpeg_Cwidth);
1114---
1115> RTjpeg_dctY(bp3+k, RTjpeg_block, RTjpeg_Cwidth);
11163351c3351
1117< RTjpeg_dctY((unsigned char *)bp2+k, RTjpeg_block, RTjpeg_Cwidth);
1118---
1119> RTjpeg_dctY(bp2+k, RTjpeg_block, RTjpeg_Cwidth);
11203360c3360
1121< RTjpeg_dctY((unsigned char *)bp3+k, RTjpeg_block, RTjpeg_Cwidth);
1122---
1123> RTjpeg_dctY(bp3+k, RTjpeg_block, RTjpeg_Cwidth);
1124diff -r main/libmpcodecs/vd_dmo.c main2/libmpcodecs/vd_dmo.c
112584c84
1126< DMO_VideoDecoder_DecodeInternal(sh->context, data, len, 1, (char *)mpi->planes[0]);
1127---
1128> DMO_VideoDecoder_DecodeInternal(sh->context, data, len, 1, mpi->planes[0]);
1129diff -r main/libmpcodecs/vd_dshow.c main2/libmpcodecs/vd_dshow.c
1130113c113
1131< DS_VideoDecoder_DecodeInternal(sh->context, data, len, 0, (char *)mpi->planes[0]);
1132---
1133> DS_VideoDecoder_DecodeInternal(sh->context, data, len, 0, mpi->planes[0]);
1134diff -r main/libmpcodecs/vd_lzo.c main2/libmpcodecs/vd_lzo.c
1135122c122
1136< r = lzo1x_decompress (data, len, tmp, (unsigned int *)&w, priv->wrkmem);
1137---
1138> r = lzo1x_decompress (data, len, tmp, &w, priv->wrkmem);
1139157c157
1140< r = lzo1x_decompress (data, len, mpi->planes[0], (unsigned int *)&w, priv->wrkmem);
1141---
1142> r = lzo1x_decompress (data, len, mpi->planes[0], &w, priv->wrkmem);
1143diff -r main/libmpcodecs/vd_mpng.c main2/libmpcodecs/vd_mpng.c
1144149c149
1145< mpi->planes[1] = (unsigned char*)realloc(mpi->planes[1], 4*cols);
1146---
1147> mpi->planes[1] = (char*)realloc(mpi->planes[1], 4*cols);
1148diff -r main/libmpcodecs/vd_realvid.c main2/libmpcodecs/vd_realvid.c
1149337c337
1150< result=(*wrvyuv_transform)((char *)dp_data, (char *)buffer, &transform_in,
1151---
1152> result=(*wrvyuv_transform)(dp_data, buffer, &transform_in,
1153341c341
1154< result=(*rvyuv_transform)((char *)dp_data, (char *)buffer, &transform_in,
1155---
1156> result=(*rvyuv_transform)(dp_data, buffer, &transform_in,
1157diff -r main/libmpcodecs/ve_nuv.c main2/libmpcodecs/ve_nuv.c
1158132c132
1159< zdata,(unsigned int *)&zlen,vf->priv->zmem);
1160---
1161> zdata,&zlen,vf->priv->zmem);
1162149c149
1163< len = RTjpeg_mcompressYUV420((signed char *)data,mpi->planes[0],vf->priv->l,
1164---
1165> len = RTjpeg_mcompressYUV420(data,mpi->planes[0],vf->priv->l,
1166157c157
1167< r = lzo1x_1_compress(data,len,zdata,(unsigned int *)&zlen,vf->priv->zmem);
1168---
1169> r = lzo1x_1_compress(data,len,zdata,&zlen,vf->priv->zmem);
1170diff -r main/libmpcodecs/vf_fspp.c main2/libmpcodecs/vf_fspp.c
1171549c549
1172< mpi->w, mpi->h, (unsigned char *)qp_tab, mpi->qstride, 1);
1173---
1174> mpi->w, mpi->h, qp_tab, mpi->qstride, 1);
1175551c551
1176< mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, (unsigned char *)qp_tab, mpi->qstride, 0);
1177---
1178> mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, qp_tab, mpi->qstride, 0);
1179553c553
1180< mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, (unsigned char *)qp_tab, mpi->qstride, 0);
1181---
1182> mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, qp_tab, mpi->qstride, 0);
1183diff -r main/libmpcodecs/vf_pp7.c main2/libmpcodecs/vf_pp7.c
1184388,390c388,390
1185< filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, (unsigned char *)mpi->qscale, mpi->qstride, 1);
1186< filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, (unsigned char *)mpi->qscale, mpi->qstride, 0);
1187< filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, (unsigned char *)mpi->qscale, mpi->qstride, 0);
1188---
1189> filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, mpi->qscale, mpi->qstride, 1);
1190> filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, mpi->qscale, mpi->qstride, 0);
1191> filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, mpi->qscale, mpi->qstride, 0);
1192diff -r main/libmpcodecs/vf_pp.c main2/libmpcodecs/vf_pp.c
1193132c132
1194< (signed char *)mpi->qscale, mpi->qstride,
1195---
1196> mpi->qscale, mpi->qstride,
1197diff -r main/libmpcodecs/vf_remove_logo.c main2/libmpcodecs/vf_remove_logo.c
1198360c360
1199< unsigned char * current_pixel = mask->pixel; /* This stores the actual pixel data. */
1200---
1201> char * current_pixel = mask->pixel; /* This stores the actual pixel data. */
1202791,792c791,792
1203< convert_yv12(vf, (char *)mpi->planes[0], mpi->stride[0], mpi, mpi->w, mpi->h,
1204< (char *)dmpi->planes[0], dmpi->stride[0],
1205---
1206> convert_yv12(vf, mpi->planes[0], mpi->stride[0], mpi, mpi->w, mpi->h,
1207> dmpi->planes[0], dmpi->stride[0],
1208796,797c796,797
1209< convert_yv12(vf, (char *)mpi->planes[1], mpi->stride[1], mpi, mpi->w / 2, mpi->h / 2,
1210< (char *)dmpi->planes[1], dmpi->stride[1],
1211---
1212> convert_yv12(vf, mpi->planes[1], mpi->stride[1], mpi, mpi->w / 2, mpi->h / 2,
1213> dmpi->planes[1], dmpi->stride[1],
1214801,802c801,802
1215< convert_yv12(vf, (char *)mpi->planes[2], mpi->stride[2], mpi, mpi->w / 2, mpi->h / 2,
1216< (char *)dmpi->planes[2], dmpi->stride[2],
1217---
1218> convert_yv12(vf, mpi->planes[2], mpi->stride[2], mpi, mpi->w / 2, mpi->h / 2,
1219> dmpi->planes[2], dmpi->stride[2],
1220diff -r main/libmpcodecs/vf_spp.c main2/libmpcodecs/vf_spp.c
1221494,496c494,496
1222< filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, (unsigned char *)qp_tab, mpi->qstride, 1);
1223< filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, (unsigned char *)qp_tab, mpi->qstride, 0);
1224< filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, (unsigned char *)qp_tab, mpi->qstride, 0);
1225---
1226> filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, qp_tab, mpi->qstride, 1);
1227> filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, qp_tab, mpi->qstride, 0);
1228> filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, qp_tab, mpi->qstride, 0);
1229diff -r main/libmpcodecs/vf_uspp.c main2/libmpcodecs/vf_uspp.c
1230295c295
1231< filter(vf->priv, dmpi->planes, mpi->planes, dmpi->stride, mpi->stride, mpi->w, mpi->h, (unsigned char *)mpi->qscale, mpi->qstride);
1232---
1233> filter(vf->priv, dmpi->planes, mpi->planes, dmpi->stride, mpi->stride, mpi->w, mpi->h, mpi->qscale, mpi->qstride);
1234diff -r main/libmpdemux/ai_alsa1x.c main2/libmpdemux/ai_alsa1x.c
123547c47
1236< snd_pcm_hw_params_get_channels(params, (unsigned int *)(&ai->channels));
1237---
1238> snd_pcm_hw_params_get_channels(params, &ai->channels);
123965c65
1240< (unsigned int *)(&ai->alsa.buffer_time), &dir);
1241---
1242> &ai->alsa.buffer_time, &dir);
124373c73
1244< (unsigned int *)(&ai->alsa.period_time), &dir);
1245---
1246> &ai->alsa.period_time, &dir);
1247diff -r main/libmpdemux/asfheader.c main2/libmpdemux/asfheader.c
1248127c127
1249< stream_read(demuxer->stream,(unsigned char*) &asfh,sizeof(asfh)); // header obj
1250---
1251> stream_read(demuxer->stream,(char*) &asfh,sizeof(asfh)); // header obj
1252179c179
1253< stream_read(demuxer->stream, (unsigned char*)(hdr), hdr_len);
1254---
1255> stream_read(demuxer->stream, hdr, hdr_len);
1256367c367
1257< stream_read(demuxer->stream, (unsigned char*)(guid_buffer), 16);
1258---
1259> stream_read(demuxer->stream, guid_buffer, 16);
1260373c373
1261< stream_read(demuxer->stream, (unsigned char *)&data_len, sizeof(data_len));
1262---
1263> stream_read(demuxer->stream, (char *)&data_len, sizeof(data_len));
1264diff -r main/libmpdemux/asf_mmst_streaming.c main2/libmpdemux/asf_mmst_streaming.c
1265170c170
1266< command = get_32 ((unsigned char*)data, 36) & 0xFFFF;
1267---
1268> command = get_32 (data, 36) & 0xFFFF;
1269212c212
1270< if (!get_data (s, (char*)pre_header, 8)) {
1271---
1272> if (!get_data (s, pre_header, 8)) {
1273229c229
1274< if (!get_data (s, (char*)(&header[header_len]), packet_len)) {
1275---
1276> if (!get_data (s, &header[header_len], packet_len)) {
1277239c239
1278< if( streaming_bufferize( streaming_ctrl, (char*)header, header_len )<0 ) {
1279---
1280> if( streaming_bufferize( streaming_ctrl, header, header_len )<0 ) {
1281275c275
1282< command = get_32 ((unsigned char*)data, 24) & 0xFFFF;
1283---
1284> command = get_32 (data, 24) & 0xFFFF;
1285380c380
1286< if (!get_data (s, (char*)pre_header, 8)) {
1287---
1288> if (!get_data (s, pre_header, 8)) {
1289438c438
1290< command = get_32 ((unsigned char*)data, 24) & 0xFFFF;
1291---
1292> command = get_32 (data, 24) & 0xFFFF;
1293diff -r main/libmpdemux/aviheader.c main2/libmpdemux/aviheader.c
1294185c185
1295< stream_read(demuxer->stream,(unsigned char*) &avih,MIN(size2,sizeof(avih)));
1296---
1297> stream_read(demuxer->stream,(char*) &avih,MIN(size2,sizeof(avih)));
1298192c192
1299< stream_read(demuxer->stream,(unsigned char*) &h,MIN(size2,sizeof(h)));
1300---
1301> stream_read(demuxer->stream,(char*) &h,MIN(size2,sizeof(h)));
1302223c223
1303< stream_read(demuxer->stream, (unsigned char *)s->dwReserved, 3*4);
1304---
1305> stream_read(demuxer->stream, (char *)s->dwReserved, 3*4);
1306252c252
1307< stream_read(demuxer->stream,(unsigned char*) sh_video->bih,chunksize);
1308---
1309> stream_read(demuxer->stream,(char*) sh_video->bih,chunksize);
1310305c305
1311< stream_read(demuxer->stream,(unsigned char*) sh_audio->wf,chunksize);
1312---
1313> stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize);
1314359c359
1315< stream_read(demuxer->stream,(unsigned char*)priv->idx,priv->idx_size<<4);
1316---
1317> stream_read(demuxer->stream,(char*)priv->idx,priv->idx_size<<4);
1318379c379
1319< stream_read(demuxer->stream, (unsigned char*)(riff_type), sizeof riff_type);
1320---
1321> stream_read(demuxer->stream, riff_type, sizeof riff_type);
1322404c404
1323< unsigned char buf[256];
1324---
1325> char buf[256];
1326410c410
1327< demux_info_add(demuxer, hdr, (char *)buf);
1328---
1329> demux_info_add(demuxer, hdr, buf);
1330457c457
1331< ret2 = stream_read(demuxer->stream, (unsigned char *)&cx->stdidx[j], 32);
1332---
1333> ret2 = stream_read(demuxer->stream, (char *)&cx->stdidx[j], 32);
1334471c471
1335< stream_read(demuxer->stream, (unsigned char *)cx->stdidx[j].aIndex,
1336---
1337> stream_read(demuxer->stream, (char *)cx->stdidx[j].aIndex,
1338diff -r main/libmpdemux/CVS/Entries main2/libmpdemux/CVS/Entries
1339100c100
1340< /network.c/1.122/Thu Feb 9 14:07:57 2006//
1341---
1342> /network.c/1.123/Mon Feb 20 21:59:28 2006//
1343diff -r main/libmpdemux/demux_audio.c main2/libmpdemux/demux_audio.c
1344225c225
1345< unsigned char tag[4];
1346---
1347> char tag[4];
1348229c229
1349< if(strcmp((char *)tag,"TAG"))
1350---
1351> if(strcmp(tag,"TAG"))
1352232c232
1353< unsigned char buf[31];
1354---
1355> char buf[31];
1356237c237
1357< demux_info_add(demuxer,"Title",(char *)buf);
1358---
1359> demux_info_add(demuxer,"Title",buf);
1360240c240
1361< demux_info_add(demuxer,"Artist",(char *)buf);
1362---
1363> demux_info_add(demuxer,"Artist",buf);
1364243c243
1365< demux_info_add(demuxer,"Album",(char *)buf);
1366---
1367> demux_info_add(demuxer,"Album",buf);
1368246c246
1369< demux_info_add(demuxer,"Year",(char *)buf);
1370---
1371> demux_info_add(demuxer,"Year",buf);
1372249c249
1373< demux_info_add(demuxer,"Comment",(char *)buf);
1374---
1375> demux_info_add(demuxer,"Comment",buf);
1376252,253c252,253
1377< sprintf((char *)buf,"%d",trk);
1378< demux_info_add(demuxer,"Track",(char *)buf);
1379---
1380> sprintf(buf,"%d",trk);
1381> demux_info_add(demuxer,"Track",buf);
1382288c288
1383< stream_read(s,(unsigned char*)((char*)(w)+sizeof(WAVEFORMATEX)),l);
1384---
1385> stream_read(s,(char*)((char*)(w)+sizeof(WAVEFORMATEX)),l);
1386291c291
1387< stream_read(s,(unsigned char*)((char*)(w)+sizeof(WAVEFORMATEX)),w->cbSize);
1388---
1389> stream_read(s,(char*)((char*)(w)+sizeof(WAVEFORMATEX)),w->cbSize);
1390diff -r main/libmpdemux/demux_gif.c main2/libmpdemux/demux_gif.c
139181c81
1392< unsigned char *comments = p + 1;
1393---
1394> char *comments = p + 1;
1395111c111
1396< if (DGifGetLine(gif, (unsigned char *)buf, len) == GIF_ERROR) {
1397---
1398> if (DGifGetLine(gif, buf, len) == GIF_ERROR) {
1399132c132
1400< unsigned char *gbuf = (unsigned char *)buf + (y * gif->Image.Width);
1401---
1402> unsigned char *gbuf = buf + (y * gif->Image.Width);
1403diff -r main/libmpdemux/demux_mkv.c main2/libmpdemux/demux_mkv.c
1404597c597
1405< result = lzo1x_decompress_safe (src, *size, *dest, (unsigned int *)&dstlen,
1406---
1407> result = lzo1x_decompress_safe (src, *size, *dest, &dstlen,
14082041c2041
1409< m = demux_mkv_decode (track,track->private_data,&buffer,(uint32_t *)&size,2);
1410---
1411> m = demux_mkv_decode (track,track->private_data,&buffer,&size,2);
14122928c2928
1413< if (block_duration != 0)
1414---
1415> if (block_duration != 0)
14162956c2956
1417< handle_subtitles (demuxer, track, (char *)block, length,
1418---
1419> handle_subtitles (demuxer, track, block, length,
14202983c2983
1421< modified = demux_mkv_decode (track, block, &buffer, (uint32_t *)&size, 1);
1422---
1423> modified = demux_mkv_decode (track, block, &buffer, &size, 1);
1424diff -r main/libmpdemux/demux_mov.c main2/libmpdemux/demux_mov.c
14251254c1254
1426< zstrm.next_in = (unsigned char *)cmov_buf;
1427---
1428> zstrm.next_in = cmov_buf;
14291328c1328
1430< stream_read(demuxer->stream, (unsigned char *)&text, text_len+2);
1431---
1432> stream_read(demuxer->stream, (char *)&text, text_len+2);
14331399c1399
1434< stream_read(demuxer->stream, (unsigned char *)&dump, udta_len-4-4);
1435---
1436> stream_read(demuxer->stream, (char *)&dump, udta_len-4-4);
14371436c1436
1438< stream_read(demuxer->stream, (unsigned char*) trak->tkdata, trak->tkdata_len);
1439---
1440> stream_read(demuxer->stream, trak->tkdata, trak->tkdata_len);
14411481c1481
1442< stream_read(demuxer->stream, (unsigned char*)str, len);
1443---
1444> stream_read(demuxer->stream, str, len);
14451822c1822
1446< stream_read(demuxer->stream, (unsigned char*)buf, len);
1447---
1448> stream_read(demuxer->stream, buf, len);
14491827c1827
1450< zstrm.next_in = (unsigned char*)buf;
1451---
1452> zstrm.next_in = buf;
14531829c1829
1454< zstrm.next_out = (unsigned char*)buf2;
1455---
1456> zstrm.next_out = buf2;
14571845c1845
1458< stream_read(demuxer->stream, (unsigned char*)buf, len);
1459---
1460> stream_read(demuxer->stream, buf, len);
1461diff -r main/libmpdemux/demux_nsv.c main2/libmpdemux/demux_nsv.c
1462180c180
1463< if((demuxer->audio->id != -2) && strncmp((char *)hdr+8,"NONE", 4)){//&&strncmp(hdr+8,"VLB ", 4)){
1464---
1465> if((demuxer->audio->id != -2) && strncmp(hdr+8,"NONE", 4)){//&&strncmp(hdr+8,"VLB ", 4)){
1466191c191
1467< if ((demuxer->video->id != -2) && strncmp((char *)hdr+4,"NONE", 4)) {
1468---
1469> if ((demuxer->video->id != -2) && strncmp(hdr+4,"NONE", 4)) {
1470diff -r main/libmpdemux/demux_nuv.c main2/libmpdemux/demux_nuv.c
147186c86
1472< if (stream_read ( demuxer->stream, (unsigned char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader))
1473---
1474> if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader))
1475163c163
1476< if (stream_read ( demuxer->stream, (unsigned char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader))
1477---
1478> if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader))
1479237c237
1480< if (stream_read(demuxer->stream, (unsigned char*)&rtjpeg_frameheader,
1481---
1482> if (stream_read(demuxer->stream, (char*)&rtjpeg_frameheader,
1483255c255
1484< if (stream_read(demuxer->stream, (unsigned char*)&ext, sizeof(ext)) < sizeof(ext))
1485---
1486> if (stream_read(demuxer->stream, (char*)&ext, sizeof(ext)) < sizeof(ext))
1487328c328
1488< stream_read ( demuxer->stream, (unsigned char*)& rtjpeg_fileheader, sizeof(rtjpeg_fileheader) );
1489---
1490> stream_read ( demuxer->stream, (char*)& rtjpeg_fileheader, sizeof(rtjpeg_fileheader) );
1491417c417
1492< if(stream_read(demuxer->stream,(unsigned char*)&ns,sizeof(ns)) != sizeof(ns))
1493---
1494> if(stream_read(demuxer->stream,(char*)&ns,sizeof(ns)) != sizeof(ns))
1495diff -r main/libmpdemux/demux_ogg.c main2/libmpdemux/demux_ogg.c
1496236c236
1497< unsigned char *packet = pack->packet;
1498---
1499> char *packet = pack->packet;
1500640c640
1501< int len = stream_read(s,(unsigned char *)buf,BLOCK_SIZE);
1502---
1503> int len = stream_read(s,buf,BLOCK_SIZE);
1504695c695
1505< int len = stream_read(s,(unsigned char *)buf,BLOCK_SIZE);
1506---
1507> int len = stream_read(s,buf,BLOCK_SIZE);
1508884c884
1509< len = stream_read(s,(unsigned char *)buf,BLOCK_SIZE);
1510---
1511> len = stream_read(s,buf,BLOCK_SIZE);
1512923c923
1513< if(pack.bytes >= 7 && ! strncmp((char *)&pack.packet[1],"vorbis", 6) ) {
1514---
1515> if(pack.bytes >= 7 && ! strncmp(&pack.packet[1],"vorbis", 6) ) {
1516932c932
1517< } else if (pack.bytes >= 80 && !strncmp((char *)pack.packet,"Speex", 5)) {
1518---
1519> } else if (pack.bytes >= 80 && !strncmp(pack.packet,"Speex", 5)) {
1520956c956
1521< } else if (pack.bytes >= 7 && !strncmp ((char *)&pack.packet[1], "theora", 6)) {
1522---
1523> } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {
15241016c1016
1525< } else if(pack.bytes >= 142 && ! strncmp((char *)&pack.packet[1],"Direct Show Samples embedded in Ogg",35) ) {
1526---
1527> } else if(pack.bytes >= 142 && ! strncmp(&pack.packet[1],"Direct Show Samples embedded in Ogg",35) ) {
15281290c1290
1529< len = stream_read(s,(unsigned char *)buf,BLOCK_SIZE);
1530---
1531> len = stream_read(s,buf,BLOCK_SIZE);
15321534c1534
1533< int len = stream_read(demuxer->stream,(unsigned char *)buf,BLOCK_SIZE);
1534---
1535> int len = stream_read(demuxer->stream,buf,BLOCK_SIZE);
1536diff -r main/libmpdemux/demux_realaud.c main2/libmpdemux/demux_realaud.c
1537228c228
1538< stream_read(demuxer->stream, (unsigned char*)buf, i);
1539---
1540> stream_read(demuxer->stream, buf, i);
1541235c235
1542< stream_read(demuxer->stream, (unsigned char*)buf, i);
1543---
1544> stream_read(demuxer->stream, buf, i);
1545242c242
1546< stream_read(demuxer->stream, (unsigned char*)buf, i);
1547---
1548> stream_read(demuxer->stream, buf, i);
1549250c250
1550< stream_read(demuxer->stream, (unsigned char*)buf, i);
1551---
1552> stream_read(demuxer->stream, buf, i);
1553diff -r main/libmpdemux/demux_real.c main2/libmpdemux/demux_real.c
1554135c135
1555< stream_read(demuxer->stream, (unsigned char *)buf, (len > buf_size) ? buf_size : len);
1556---
1557> stream_read(demuxer->stream, buf, (len > buf_size) ? buf_size : len);
15581164c1164
1559< stream_read(demuxer->stream, (unsigned char*)buf, len);
1560---
1561> stream_read(demuxer->stream, buf, len);
15621174c1174
1563< stream_read(demuxer->stream, (unsigned char*)buf, len);
1564---
1565> stream_read(demuxer->stream, buf, len);
15661184c1184
1567< stream_read(demuxer->stream, (unsigned char*)buf, len);
1568---
1569> stream_read(demuxer->stream, buf, len);
15701194c1194
1571< stream_read(demuxer->stream, (unsigned char*)buf, len);
1572---
1573> stream_read(demuxer->stream, buf, len);
15741226c1226
1575< stream_read(demuxer->stream, (unsigned char*)descr, len);
1576---
1577> stream_read(demuxer->stream, descr, len);
15781234c1234
1579< stream_read(demuxer->stream, (unsigned char*)mimet, len);
1580---
1581> stream_read(demuxer->stream, mimet, len);
15821287c1287
1583< stream_read(demuxer->stream, (unsigned char*)buft, i);
1584---
1585> stream_read(demuxer->stream, buft, i);
15861294c1294
1587< stream_read(demuxer->stream, (unsigned char*)buft, i);
1588---
1589> stream_read(demuxer->stream, buft, i);
15901301c1301
1591< stream_read(demuxer->stream, (unsigned char*)buft, i);
1592---
1593> stream_read(demuxer->stream, buft, i);
15941363c1363
1595< stream_read(demuxer->stream, (unsigned char*)buf, 4); // fourcc
1596---
1597> stream_read(demuxer->stream, buf, 4); // fourcc
15981414c1414
1599< stream_read(demuxer->stream, ((unsigned char*)(sh->wf+1)), codecdata_length); // extras
1600---
1601> stream_read(demuxer->stream, ((char*)(sh->wf+1)), codecdata_length); // extras
1602diff -r main/libmpdemux/demux_smjpeg.c main2/libmpdemux/demux_smjpeg.c
160334c34
1604< stream_read(demuxer->stream, (unsigned char *)buf, 6);
1605---
1606> stream_read(demuxer->stream, buf, 6);
1607diff -r main/libmpdemux/demux_ts.c main2/libmpdemux/demux_ts.c
1608446c446
1609< if(strncmp((char *)pmt->es[j].lang, lang, 3) == 0)
1610---
1611> if(strncmp(pmt->es[j].lang, lang, 3) == 0)
1612519c519
1613< frame_length = mp_a52_framesize((unsigned char *)(&buf[cnt]), &srate);
1614---
1615> frame_length = mp_a52_framesize(&buf[cnt], &srate);
16162154c2154
1617< unsigned char *d;
1618---
1619> char *d;
16202784c2784
1621< asgn = (strncmp((char *)lang, dvdsub_lang, 3) == 0);
1622---
1623> asgn = (strncmp(lang, dvdsub_lang, 3) == 0);
16242851c2851
1625< stream_read(stream, (unsigned char*)p, buf_size);
1626---
1627> stream_read(stream, p, buf_size);
16282854c2854
1629< len = pes_parse2((unsigned char*)p, buf_size, es, pid_type, pmt, pid);
1630---
1631> len = pes_parse2(p, buf_size, es, pid_type, pmt, pid);
16322875c2875
1633< es->start = (unsigned char*)p;
1634---
1635> es->start = p;
16362905c2905
1637< es->start = (unsigned char*)p;
1638---
1639> es->start = p;
16403185c3185
1641< return -ts_parse(demuxer, &es, (unsigned char*)priv->packet, 0);
1642---
1643> return -ts_parse(demuxer, &es, priv->packet, 0);
1644diff -r main/libmpdemux/demux_ty.c main2/libmpdemux/demux_ty.c
1645196c196
1646< count = stream_read( demux->stream, (unsigned char *)header, 512 );
1647---
1648> count = stream_read( demux->stream, header, 512 );
1649diff -r main/libmpdemux/demux_viv.c main2/libmpdemux/demux_viv.c
1650106c106
1651< stream_read(demux->stream, (unsigned char*)buf, header_len);
1652---
1653> stream_read(demux->stream, buf, header_len);
1654270c270
1655< if(strncmp((char *)buf+i,"Version:Vivo/",13)) return 0; // bad version/type!
1656---
1657> if(strncmp(buf+i,"Version:Vivo/",13)) return 0; // bad version/type!
1658diff -r main/libmpdemux/demux_vqf.c main2/libmpdemux/demux_vqf.c
165917c17
1660< if(stream_read(s,(unsigned char *)buf,KEYWORD_BYTES)!=KEYWORD_BYTES)
1661---
1662> if(stream_read(s,buf,KEYWORD_BYTES)!=KEYWORD_BYTES)
166345c45
1664< stream_read(s,(unsigned char *)hi->ID+KEYWORD_BYTES,VERSION_BYTES); /* fourcc+version_id */
1665---
1666> stream_read(s,hi->ID+KEYWORD_BYTES,VERSION_BYTES); /* fourcc+version_id */
166751c51
1668< stream_read(s,(unsigned char *)chunk_id,4);
1669---
1670> stream_read(s,chunk_id,4);
167156c56
1672< if(stream_read(s,(unsigned char *)buf,chunk_size-8)!=chunk_size-8) return NULL;
1673---
1674> if(stream_read(s,buf,chunk_size-8)!=chunk_size-8) return NULL;
1675diff -r main/libmpdemux/demux_y4m.c main2/libmpdemux/demux_y4m.c
167633c33
1677< if(stream_read(demuxer->stream, (unsigned char *)buf, 9)!=9)
1678---
1679> if(stream_read(demuxer->stream, buf, 9)!=9)
1680136c136
1681< stream_read(demuxer->stream, (unsigned char *)&buf[0], 3);
1682---
1683> stream_read(demuxer->stream, (char *)&buf[0], 3);
1684140c140
1685< stream_read(demuxer->stream, (unsigned char *)&buf[0], 3);
1686---
1687> stream_read(demuxer->stream, (char *)&buf[0], 3);
1688144c144
1689< stream_read(demuxer->stream, (unsigned char *)&buf[0], 1);
1690---
1691> stream_read(demuxer->stream, (char *)&buf[0], 1);
1692diff -r main/libmpdemux/ebml.c main2/libmpdemux/ebml.c
1693229c229
1694< if (stream_read(s, (unsigned char *)str, len) != (int) len)
1695---
1696> if (stream_read(s, str, len) != (int) len)
1697diff -r main/libmpdemux/http.c main2/libmpdemux/http.c
169879c79
1699< info_read = my_read(fd, (char *)info, 1, sc);
1700---
1701> info_read = my_read(fd, info, 1, sc);
170281c81
1703< info_read = my_read(fd, (char *)info, 6, sc);
1704---
1705> info_read = my_read(fd, info, 6, sc);
170683c83
1707< info_read += my_read(fd, (char *)(&info[1]), 5, sc);
1708---
1709> info_read += my_read(fd, &info[1], 5, sc);
1710111c111
1711< my_read(fd, (char *)(&tmp), 1, sc);
1712---
1713> my_read(fd, &tmp, 1, sc);
1714diff -r main/libmpdemux/muxer_mpeg.c main2/libmpdemux/muxer_mpeg.c
1715527,528c527,528
1716< write_mpeg_ts((unsigned char *)&buff[4], priv->scr, 0x20); // 0010 and SCR
1717< write_mpeg_rate(priv->mux, (unsigned char *)&buff[9], muxer->sysrate);
1718---
1719> write_mpeg_ts(&buff[4], priv->scr, 0x20); // 0010 and SCR
1720> write_mpeg_rate(priv->mux, &buff[9], muxer->sysrate);
1721533,534c533,534
1722< write_mpeg2_scr((unsigned char *)&buff[4], priv->scr); // 0010 and SCR
1723< write_mpeg_rate(priv->mux, (unsigned char *)&buff[10], muxer->sysrate);
1724---
1725> write_mpeg2_scr(&buff[4], priv->scr); // 0010 and SCR
1726> write_mpeg_rate(priv->mux, &buff[10], muxer->sysrate);
1727555c555
1728< write_mpeg_rate(MUX_MPEG1, (unsigned char *)&buff[len], muxer->sysrate);
1729---
1730> write_mpeg_rate(MUX_MPEG1, &buff[len], muxer->sysrate);
1731566c566
1732< write_mpeg_std((unsigned char *)&buff[len], priv->sys_info.streams[i].bufsize, priv->sys_info.streams[i].type,
1733---
1734> write_mpeg_std(&buff[len], priv->sys_info.streams[i].bufsize, priv->sys_info.streams[i].type,
1735622c622
1736< *(uint32_t *)((unsigned char *)&buff[len]) = CalcCRC32((unsigned char *)buff, len);
1737---
1738> *(uint32_t *)(&buff[len]) = CalcCRC32(buff, len);
1739731,732c731,732
1740< offset = write_mpeg_pack_header(muxer, (char *)buff);
1741< offset += write_mpeg_psm(muxer, (char *)&buff[offset]);
1742---
1743> offset = write_mpeg_pack_header(muxer, buff);
1744> offset += write_mpeg_psm(muxer, &buff[offset]);
1745844,845c844,845
1746< offset = write_mpeg_pack_header(muxer, (char *)buff);
1747< offset += write_mpeg_system_header(muxer, (char *)&buff[offset]);
1748---
1749> offset = write_mpeg_pack_header(muxer, buff);
1750> offset += write_mpeg_system_header(muxer, &buff[offset]);
1751878c878
1752< offset = pack_hlen = write_mpeg_pack_header(muxer, (char *)&buff[offset]);
1753---
1754> offset = pack_hlen = write_mpeg_pack_header(muxer, &buff[offset]);
1755882c882
1756< pack_hlen += write_mpeg_system_header(muxer, (char *)&buff[offset]);
1757---
1758> pack_hlen += write_mpeg_system_header(muxer, &buff[offset]);
17591138c1138
1760< len = write_mpeg_pack(muxer, as, muxer->file, (char *)priv->abuf, tlen, 0);
1761---
1762> len = write_mpeg_pack(muxer, as, muxer->file, priv->abuf, tlen, 0);
17631666c1666
1764< pl_size = write_mpeg_pack(muxer, vs, muxer->file, (char *)buf, pl_size, 0);
1765---
1766> pl_size = write_mpeg_pack(muxer, vs, muxer->file, buf, pl_size, 0);
17672543c2543
1768< parse_audio(s, 0, (int *)&nf, &fake_timer);
1769---
1770> parse_audio(s, 0, &nf, &fake_timer);
1771diff -r main/libmpdemux/network.c main2/libmpdemux/network.c
177278a79,80
1773> { "application/vnd.ms.wms-hdr.asfv1", DEMUXER_TYPE_ASF },
1774> { "application/octet-stream", DEMUXER_TYPE_ASF },
1775diff -r main/libmpdemux/pnm.c main2/libmpdemux/pnm.c
1776445,446c445,446
1777< c+=pnm_write_chunk(PNA_CLIENT_CHALLANGE,strlen((char *)pnm_challenge),
1778< (char *)pnm_challenge,&p->buffer[c]);
1779---
1780> c+=pnm_write_chunk(PNA_CLIENT_CHALLANGE,strlen(pnm_challenge),
1781> pnm_challenge,&p->buffer[c]);
1782448c448
1783< (char *)pnm_client_caps,&p->buffer[c]);
1784---
1785> pnm_client_caps,&p->buffer[c]);
1786453,454c453,454
1787< c+=pnm_write_chunk(PNA_TIMESTAMP,strlen((char *)pnm_timestamp),
1788< (char *)pnm_timestamp,&p->buffer[c]);
1789---
1790> c+=pnm_write_chunk(PNA_TIMESTAMP,strlen(pnm_timestamp),
1791> pnm_timestamp,&p->buffer[c]);
1792464,465c464,465
1793< c+=pnm_write_chunk(PNA_GUID,strlen((char *)pnm_guid),
1794< (char *)pnm_guid,&p->buffer[c]);
1795---
1796> c+=pnm_write_chunk(PNA_GUID,strlen(pnm_guid),
1797> pnm_guid,&p->buffer[c]);
1798467c467
1799< (char *)pnm_twentyfour,&p->buffer[c]);
1800---
1801> pnm_twentyfour,&p->buffer[c]);
1802475c475
1803< i16=BE_16D((strlen((char *)client_string)-1)); /* don't know why do we have -1 here */
1804---
1805> i16=BE_16D((strlen(client_string)-1)); /* don't know why do we have -1 here */
1806477,478c477,478
1807< memcpy(&p->buffer[c+3],client_string,strlen((char *)client_string)+1);
1808< c=c+3+strlen((char *)client_string)+1;
1809---
1810> memcpy(&p->buffer[c+3],client_string,strlen(client_string)+1);
1811> c=c+3+strlen(client_string)+1;
1812538c538
1813< chunk_size=pnm_get_chunk(p,HEADER_SIZE-size,&chunk_type,(char *)ptr,&nr);
1814---
1815> chunk_size=pnm_get_chunk(p,HEADER_SIZE-size,&chunk_type,ptr,&nr);
1816800c800
1817< pnm_send_response(p, (char *)pnm_response);
1818---
1819> pnm_send_response(p, pnm_response);
1820817c817
1821< unsigned char *source=this->recv + this->recv_read;
1822---
1823> char *source=this->recv + this->recv_read;
1824diff -r main/libmpdemux/realrtsp/real.c main2/libmpdemux/realrtsp/real.c
1825402c402
1826< table_len = strlen((char *)xor_table);
1827---
1828> table_len = strlen(xor_table);
1829609c609
1830< n=rtsp_read_data(rtsp_session, (char *)header, 8);
1831---
1832> n=rtsp_read_data(rtsp_session, header, 8);
1833630c630
1834< n=rtsp_read_data(rtsp_session, (char *)header+3, 5);
1835---
1836> n=rtsp_read_data(rtsp_session, header+3, 5);
1837636c636
1838< n=rtsp_read_data(rtsp_session, (char *)header+4, 4);
1839---
1840> n=rtsp_read_data(rtsp_session, header+4, 4);
1841644c644
1842< n=rtsp_read_data(rtsp_session, (char *)header, 6);
1843---
1844> n=rtsp_read_data(rtsp_session, header, 6);
1845diff -r main/libmpdemux/realrtsp/rtsp_session.c main2/libmpdemux/realrtsp/rtsp_session.c
1846137c137
1847< rtsp_session->header_len=rmff_dump_header(h,(char *)rtsp_session->header,1024);
1848---
1849> rtsp_session->header_len=rmff_dump_header(h,rtsp_session->header,1024);
1850161c161
1851< unsigned char *source=this->recv + this->recv_read;
1852---
1853> char *source=this->recv + this->recv_read;
1854diff -r main/libmpdemux/rtp.c main2/libmpdemux/rtp.c
1855154c154
1856< getsockopt( socket_server_fd, SOL_SOCKET, SO_ERROR, &err, (unsigned int *)&err_len );
1857---
1858> getsockopt( socket_server_fd, SOL_SOCKET, SO_ERROR, &err, &err_len );
1859diff -r main/libmpdemux/stream.c main2/libmpdemux/stream.c
1860223c223
1861< len=s->streaming_ctrl->streaming_read(s->fd,(char *)s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break;
1862---
1863> len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break;
1864236c236
1865< len= s->fill_buffer ? s->fill_buffer(s,(char *)s->buffer,STREAM_BUFFER_SIZE) : 0;
1866---
1867> len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0;
1868diff -r main/libmpdemux/stream_dvd.c main2/libmpdemux/stream_dvd.c
1869146c146
1870< while(strlen((char *)lang)>=2) {
1871---
1872> while(strlen(lang)>=2) {
1873183c183
1874< while(lang && strlen((char *)lang)>=2) {
1875---
1876> while(lang && strlen(lang)>=2) {
1877diff -r main/libmpdemux/stream_file.c main2/libmpdemux/stream_file.c
187862c62
1879< int len=s->fill_buffer(s,(char *)s->buffer,STREAM_BUFFER_SIZE);
1880---
1881> int len=s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE);
1882104c104
1883< if(!strcmp((char *)filename,"-")){
1884---
1885> if(!strcmp(filename,"-")){
1886120c120
1887< f=open((char *)filename,m);
1888---
1889> f=open(filename,m);
1890diff -r main/libmpdemux/stream.h main2/libmpdemux/stream.h
1891193c193
1892< inline static int stream_read(stream_t *s,unsigned char* mem,int total){
1893---
1894> inline static int stream_read(stream_t *s,char* mem,int total){
1895diff -r main/libmpdemux/tvi_v4l2.c main2/libmpdemux/tvi_v4l2.c
1896748c748
1897< if (!strcasecmp((char *)standard.name, (char *)arg)) {
1898---
1899> if (!strcasecmp(standard.name, (char *)arg)) {
1900diff -r main/libmpdemux/video.c main2/libmpdemux/video.c
1901144c144
1902< videobuffer=(unsigned char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
1903---
1904> videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
1905237c237
1906< videobuffer=(unsigned char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
1907---
1908> videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
1909298c298
1910< videobuffer=(unsigned char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
1911---
1912> videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
1913diff -r main/libmpdemux/yuv4mpeg.c main2/libmpdemux/yuv4mpeg.c
191466c66
1915< n = stream_read(s, (unsigned char*)(buf), len);
1916---
1917> n = stream_read(s, buf, len);
1918600c600
1919< if (y4m_read(s, (char *)yuv[0], w*h)) return Y4M_ERR_SYSTEM;
1920---
1921> if (y4m_read(s, yuv[0], w*h)) return Y4M_ERR_SYSTEM;
1922602,603c602,603
1923< if (y4m_read(s, (char *)yuv[1], w*h/4)) return Y4M_ERR_SYSTEM;
1924< if (y4m_read(s, (char *)yuv[2], w*h/4)) return Y4M_ERR_SYSTEM;
1925---
1926> if (y4m_read(s, yuv[1], w*h/4)) return Y4M_ERR_SYSTEM;
1927> if (y4m_read(s, yuv[2], w*h/4)) return Y4M_ERR_SYSTEM;
1928diff -r main/libmpdvdkit2/css.c main2/libmpdvdkit2/css.c
1929182c182
1930< && sscanf( (char *)psz_key, "%x:%x:%x:%x:%x",
1931---
1932> && sscanf( psz_key, "%x:%x:%x:%x:%x",
1933227c227
1934< sprintf( (char *)psz_key, "%02x:%02x:%02x:%02x:%02x\r\n",
1935---
1936> sprintf( psz_key, "%02x:%02x:%02x:%02x:%02x\r\n",
1937diff -r main/libmpdvdkit2/libdvdcss.c main2/libmpdvdkit2/libdvdcss.c
1938389,390c389,390
1939< sprintf( (char *)psz_tagfile, "%s/CACHEDIR.TAG", psz_cache );
1940< i_fd = open( (char *)psz_tagfile, O_RDWR|O_CREAT, 0644 );
1941---
1942> sprintf( psz_tagfile, "%s/CACHEDIR.TAG", psz_cache );
1943> i_fd = open( psz_tagfile, O_RDWR|O_CREAT, 0644 );
1944471c471
1945< sprintf( (char *)psz_tmp,
1946---
1947> sprintf( psz_tmp,
1948488c488
1949< sprintf( (char *)&psz_key[1+i*2], "%.2x", dvdcss->css.p_disc_key[i] );
1950---
1951> sprintf( &psz_key[1+i*2], "%.2x", dvdcss->css.p_disc_key[i] );
1952529c529
1953< sprintf( (char *)psz_debug, "using CSS key cache dir: %s",
1954---
1955> sprintf( psz_debug, "using CSS key cache dir: %s",
1956531c531
1957< print_debug(dvdcss, (char *)psz_debug );
1958---
1959> print_debug( dvdcss, psz_debug );
1960diff -r main/libvo/font_load.c main2/libvo/font_load.c
196187c87
1962< while(fgets((char *)sor,1020,f)){
1963---
1964> while(fgets(sor,1020,f)){
1965136c136
1966< int len=strlen((char *)p[0]);
1967---
1968> int len=strlen(p[0]);
1969138c138
1970< strcpy(section,(char *)p[0]);
1971---
1972> strcpy(section,p[0]);
1973152c152
1974< desc->fpath=strdup((char *)p[0]);
1975---
1976> desc->fpath=strdup(p[0]);
1977159c159
1978< if(pdb==2 && strcmp((char *)p[0],"alpha")==0){
1979---
1980> if(pdb==2 && strcmp(p[0],"alpha")==0){
1981161c161
1982< if (!(cp=malloc(strlen(desc->fpath)+strlen((char *)p[1])+2))) goto fail_out;
1983---
1984> if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) goto fail_out;
1985163c163
1986< snprintf(cp,strlen(desc->fpath)+strlen((char *)p[1])+2,"%s/%s",
1987---
1988> snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s/%s",
1989167c167
1990< if (!(cp=malloc(strlen(default_dir)+strlen((char *)p[1])+2)))
1991---
1992> if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2)))
1993169c169
1994< snprintf(cp,strlen(default_dir)+strlen((char *)p[1])+2,"%s/%s",
1995---
1996> snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s/%s",
1997180c180
1998< if(pdb==2 && strcmp((char *)p[0],"bitmap")==0){
1999---
2000> if(pdb==2 && strcmp(p[0],"bitmap")==0){
2001182c182
2002< if (!(cp=malloc(strlen(desc->fpath)+strlen((char *)p[1])+2))) goto fail_out;
2003---
2004> if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) goto fail_out;
2005184c184
2006< snprintf(cp,strlen(desc->fpath)+strlen((char *)p[1])+2,"%s/%s",
2007---
2008> snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s/%s",
2009188c188
2010< if (!(cp=malloc(strlen(default_dir)+strlen((char *)p[1])+2)))
2011---
2012> if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2)))
2013190c190
2014< snprintf(cp,strlen(default_dir)+strlen((char *)p[1])+2,"%s/%s",
2015---
2016> snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s/%s",
2017204,205c204,205
2018< if(pdb==2 && strcmp((char *)p[0],"name")==0){
2019< desc->name=strdup((char *)p[1]);
2020---
2021> if(pdb==2 && strcmp(p[0],"name")==0){
2022> desc->name=strdup(p[1]);
2023208,209c208,209
2024< if(pdb==2 && strcmp((char *)p[0],"descversion")==0){
2025< version=atoi((char *)p[1]);
2026---
2027> if(pdb==2 && strcmp(p[0],"descversion")==0){
2028> version=atoi(p[1]);
2029212,213c212,213
2030< if(pdb==2 && strcmp((char *)p[0],"spacewidth")==0){
2031< desc->spacewidth=atoi((char *)p[1]);
2032---
2033> if(pdb==2 && strcmp(p[0],"spacewidth")==0){
2034> desc->spacewidth=atoi(p[1]);
2035216,217c216,217
2036< if(pdb==2 && strcmp((char *)p[0],"charspace")==0){
2037< desc->charspace=atoi((char *)p[1]);
2038---
2039> if(pdb==2 && strcmp(p[0],"charspace")==0){
2040> desc->charspace=atoi(p[1]);
2041220,221c220,221
2042< if(pdb==2 && strcmp((char *)p[0],"height")==0){
2043< desc->height=atoi((char *)p[1]);
2044---
2045> if(pdb==2 && strcmp(p[0],"height")==0){
2046> desc->height=atoi(p[1]);
2047229,230c229,230
2048< int start=atoi((char *)p[1]);
2049< int end=atoi((char *)p[2]);
2050---
2051> int start=atoi(p[1]);
2052> int end=atoi(p[2]);
2053232c232
2054< else if(strlen((char *)p[0])!=1) chr=strtol((char *)p[0],NULL,0);
2055---
2056> else if(strlen(p[0])!=1) chr=strtol(p[0],NULL,0);
2057diff -r main/libvo/font_load_ft.c main2/libvo/font_load_ft.c
2058601c601
2059< (int *)desc->tables.gt2, desc->tables.g_r,
2060---
2061> desc->tables.gt2, desc->tables.g_r,
2062743c743
2063< iconv(*cd, &inbuf, (unsigned int *)&inbytesleft, &outbuf, (unsigned int *)&outbytesleft);
2064---
2065> iconv(*cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
20661145c1145
2067< fc_pattern = FcNameParse((unsigned char *)font_name);
2068---
2069> fc_pattern = FcNameParse(font_name);
20701151c1151
2071< fc_pattern = FcNameParse((unsigned char *)"sans-serif");
2072---
2073> fc_pattern = FcNameParse("sans-serif");
20741158c1158
2075< vo_font=read_font_desc_ft((char *)s, width, height);
2076---
2077> vo_font=read_font_desc_ft(s, width, height);
2078diff -r main/libvo/sub.c main2/libvo/sub.c
2079370c370
2080< len=strlen((char *)t)-1;
2081---
2082> len=strlen(t)-1;
2083diff -r main/libvo/vo_dga.c main2/libvo/vo_dga.c
2084246c246
2085< vo_draw_alpha_rgb32(w, h, src, srca, stride, (unsigned char *)d + 4 * offset,
2086---
2087> vo_draw_alpha_rgb32(w, h, src, srca, stride, d + 4 * offset,
2088250c250
2089< vo_draw_alpha_rgb24(w, h, src, srca, stride, (unsigned char *)d + 3 * offset,
2090---
2091> vo_draw_alpha_rgb24(w, h, src, srca, stride, d + 3 * offset,
2092254c254
2093< vo_draw_alpha_rgb15(w, h, src, srca, stride, (unsigned char *)d + 2 * offset,
2094---
2095> vo_draw_alpha_rgb15(w, h, src, srca, stride, d + 2 * offset,
2096258c258
2097< vo_draw_alpha_rgb16(w, h, src, srca, stride, (unsigned char *)d + 2 * offset,
2098---
2099> vo_draw_alpha_rgb16(w, h, src, srca, stride, d + 2 * offset,
2100640c640
2101< aspect((int *)&scale_dstW, (int *)&scale_dstH, A_ZOOM);
2102---
2103> aspect(&scale_dstW, &scale_dstH, A_ZOOM);
2104642c642
2105< aspect((int *)&scale_dstW, (int *)&scale_dstH, A_NOZOOM);
2106---
2107> aspect(&scale_dstW, &scale_dstH, A_NOZOOM);
2108diff -r main/libvo/vo_gl2.c main2/libvo/vo_gl2.c
2109794c794
2110< resize((int *)&d_width, (int *)&d_height);
2111---
2112> resize(&d_width, &d_height);
2113823c823
2114< aspect((int *)&d_width,(int *)&d_height,A_NOZOOM);
2115---
2116> aspect(&d_width,&d_height,A_NOZOOM);
2117826c826
2118< geometry(&vo_dx, &vo_dy, (int *)&d_width, (int *)&d_height,
2119---
2120> geometry(&vo_dx, &vo_dy, &d_width, &d_height,
2121865c865
2122< glFindFormat(format, (int *)&image_bpp, &gl_internal_format, &gl_bitmap_format, &gl_bitmap_type);
2123---
2124> glFindFormat(format, &image_bpp, &gl_internal_format, &gl_bitmap_format, &gl_bitmap_type);
2125diff -r main/libvo/vo_gl.c main2/libvo/vo_gl.c
2126311c311
2127< aspect((int *)&d_width,(int *)&d_height,A_NOZOOM);
2128---
2129> aspect(&d_width,&d_height,A_NOZOOM);
2130314c314
2131< geometry(&vo_dx, &vo_dy, (int *)&d_width, (int *)&d_height,
2132---
2133> geometry(&vo_dx, &vo_dy, &d_width, &d_height,
2134diff -r main/libvo/vo_jpeg.c main2/libvo/vo_jpeg.c
2135182c182
2136< if ( (outfile = fopen((char *)name, "wb") ) == NULL ) {
2137---
2138> if ( (outfile = fopen(name, "wb") ) == NULL ) {
2139267c267
2140< return jpeg_write((unsigned char *)buf, src[0]);
2141---
2142> return jpeg_write(buf, src[0]);
2143Seulement dans main2/libvo: vo_macosx.h
2144Seulement dans main2/libvo: vo_macosx.m
2145Seulement dans main2/libvo: vo_quartz.h
2146diff -r main/libvo/vo_x11.c main2/libvo/vo_x11.c
2147291c291
2148< geometry(&vo_dx, &vo_dy, (int *)&d_width, (int *)&d_height, vo_screenwidth,
2149---
2150> geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth,
2151349,350c349,350
2152< vo_vm_switch(vm_width, vm_height, (int *)&modeline_width,
2153< (int *)&modeline_height);
2154---
2155> vo_vm_switch(vm_width, vm_height, &modeline_width,
2156> &modeline_height);
2157395,396c395,396
2158< &vo_dx, &vo_dy, (unsigned int *)&vo_dwidth, (unsigned int *)&vo_dheight,
2159< (unsigned int *)&border, (unsigned int *)&depth);
2160---
2161> &vo_dx, &vo_dy, &vo_dwidth, &vo_dheight,
2162> &border, &depth);
2163diff -r main/libvo/vo_xover.c main2/libvo/vo_xover.c
216483,84c83,84
2165< XGetGeometry(mDisplay, vo_window, &mRoot, (int *)&drwX, (int *)&drwY, (unsigned int *)&drwWidth,
2166< (unsigned int *)&drwHeight, &drwBorderWidth, &drwDepth);
2167---
2168> XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &drwWidth,
2169> &drwHeight, &drwBorderWidth, &drwDepth);
217088,89c88,89
2171< (int *)&drwcX, (int *)&drwcY, &mRoot);
2172< aspect((int *)&dwidth,(int *)&dheight,A_NOZOOM);
2173---
2174> &drwcX, &drwcY, &mRoot);
2175> aspect(&dwidth,&dheight,A_NOZOOM);
217698c98
2177< aspect((int *)&dwidth,(int *)&dheight,A_NOZOOM);
2178---
2179> aspect(&dwidth,&dheight,A_NOZOOM);
2180105c105
2181< aspect((int *)&dwidth,(int *)&dheight,A_ZOOM);
2182---
2183> aspect(&dwidth,&dheight,A_ZOOM);
2184261c261
2185< aspect((int *)&d_width, (int *)&d_height, A_NOZOOM);
2186---
2187> aspect(&d_width, &d_height, A_NOZOOM);
2188273c273
2189< if ( ( flags&VOFLAG_FULLSCREEN )||(flags & VOFLAG_SWSCALE) ) aspect((int *)&d_width, (int *)&d_height, A_ZOOM);
2190---
2191> if ( ( flags&VOFLAG_FULLSCREEN )||(flags & VOFLAG_SWSCALE) ) aspect(&d_width, &d_height, A_ZOOM);
2192diff -r main/libvo/vo_xv.c main2/libvo/vo_xv.c
2193105c105
2194< (unsigned char *)xvimage[current_buf]->data +
2195---
2196> xvimage[current_buf]->data +
2197117c117
2198< (unsigned char *)xvimage[current_buf]->data +
2199---
2200> xvimage[current_buf]->data +
2201129c129
2202< (unsigned char *)xvimage[current_buf]->data +
2203---
2204> xvimage[current_buf]->data +
2205195c195
2206< geometry(&vo_dx, &vo_dy, (int *)&d_width, (int *)&d_height, vo_screenwidth,
2207---
2208> geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth,
2209235c235
2210< aspect((int *)&d_width, (int *)&d_height, A_NOZOOM);
2211---
2212> aspect(&d_width, &d_height, A_NOZOOM);
2213250,251c250,251
2214< vo_vm_switch(vm_width, vm_height, (int *)&modeline_width,
2215< (int *)&modeline_height);
2216---
2217> vo_vm_switch(vm_width, vm_height, &modeline_width,
2218> &modeline_height);
2219269c269
2220< aspect((int *)&d_width, (int *)&d_height, A_ZOOM);
2221---
2222> aspect(&d_width, &d_height, A_ZOOM);
2223312c312
2224< (int *)&drwX, (int *)&drwY, (unsigned int *)&vo_dwidth, (unsigned int *)&vo_dheight,
2225---
2226> &drwX, &drwY, &vo_dwidth, &vo_dheight,
2227567,568c567,568
2228< XGetGeometry(mDisplay, vo_window, &mRoot, (int *)&drwX, (int *)&drwY, (unsigned int *)&vo_dwidth,
2229< (unsigned int *)&vo_dheight, &drwBorderWidth, &drwDepth);
2230---
2231> XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &vo_dwidth,
2232> &vo_dheight, &drwBorderWidth, &drwDepth);
2233573c573
2234< aspect((int *)&dwidth, (int *)&dheight, A_NOZOOM);
2235---
2236> aspect(&dwidth, &dheight, A_NOZOOM);
2237576c576
2238< aspect((int *)&dwidth, (int *)&dheight, A_ZOOM);
2239---
2240> aspect(&dwidth, &dheight, A_ZOOM);
2241diff -r main/libvo/vo_xvidix.c main2/libvo/vo_xvidix.c
224284,85c84,85
2243< XGetGeometry(mDisplay, vo_window, &mRoot, (int *)&drwX, (int *)&drwY, (unsigned int *)&drwWidth,
2244< (unsigned int *)&drwHeight, &drwBorderWidth, &drwDepth);
2245---
2246> XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &drwWidth,
2247> &drwHeight, &drwBorderWidth, &drwDepth);
224889,90c89,90
2249< (int *)&drwcX, (int *)&drwcY, &mRoot);
2250< aspect((int *)&dwidth, (int *)&dheight, A_NOZOOM);
2251---
2252> &drwcX, &drwcY, &mRoot);
2253> aspect(&dwidth, &dheight, A_NOZOOM);
225499c99
2255< aspect((int *)&dwidth, (int *)&dheight, A_NOZOOM);
2256---
2257> aspect(&dwidth, &dheight, A_NOZOOM);
2258109c109
2259< aspect((int *)&dwidth, (int *)&dheight, A_ZOOM);
2260---
2261> aspect(&dwidth, &dheight, A_ZOOM);
2262258c258
2263< geometry(&vo_dx, &vo_dy, (int *)&d_width, (int *)&d_height, vo_screenwidth,
2264---
2265> geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth,
2266291c291
2267< aspect((int *)&d_width, (int *)&d_height, A_NOZOOM);
2268---
2269> aspect(&d_width, &d_height, A_NOZOOM);
2270305c305
2271< aspect((int *)&d_width, (int *)&d_height, A_ZOOM);
2272---
2273> aspect(&d_width, &d_height, A_ZOOM);
2274diff -r main/libvo/x11_common.c main2/libvo/x11_common.c
22751039,1040c1039,1040
2276< (unsigned int *)&foo /*width */ ,(unsigned int *) &foo /*height */ ,(unsigned int *) &foo,
2277< (unsigned int *)&foo);
2278---
2279> &foo /*width */ , &foo /*height */ , &foo,
2280> &foo);
2281diff -r main/loader/pe_image.c main2/loader/pe_image.c
2282315c315
2283< thunk_list->u1.Function=LookupExternalByName(name, (char *)pe_name->Name);
2284---
2285> thunk_list->u1.Function=LookupExternalByName(name, pe_name->Name);
2286336c336
2287< name, (char *)pe_name->Name);
2288---
2289> name, pe_name->Name);
2290diff -r main/loader/qtx/qtxsdk/components.h main2/loader/qtx/qtxsdk/components.h
2291646c646
2292< x=((unsigned char*)(&id->clutID))+2;
2293---
2294> x=((char*)(&id->clutID))+2;
2295diff -r main/loader/win32.c main2/loader/win32.c
22962292c2292
2297< unsigned int result;
2298---
2299> int result;
2300diff -r main/mencoder.c main2/mencoder.c
2301324c324
2302< (unsigned char *)&sh_audio->a_out_buffer[sh_audio->a_out_buffer_len],
2303---
2304> &sh_audio->a_out_buffer[sh_audio->a_out_buffer_len],
2305565,566c565,566
2306< if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,(unsigned char *)audio_lang);
2307< if(dvdsub_lang && dvdsub_id==-2) dvdsub_id=dvd_sid_from_lang(stream,(unsigned char *)dvdsub_lang);
2308---
2309> if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
2310> if(dvdsub_lang && dvdsub_id==-2) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
2311673c673
2312< if (spudec_ifo && vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, dvdsub_id, (char *)tmp) >= 0)
2313---
2314> if (spudec_ifo && vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, dvdsub_id, tmp) >= 0)
2315diff -r main/mp3lib/sr1.c main2/mp3lib/sr1.c
2316181c181
2317< if(mp3_read((char *)hbuf,4) != 4) return FALSE;
2318---
2319> if(mp3_read(hbuf,4) != 4) return FALSE;
2320200c200
2321< if(mp3_read((char *)hbuf+3,1) != 1) return 0;
2322---
2323> if(mp3_read(hbuf+3,1) != 1) return 0;
2324302c302
2325< if( mp3_read((char *)bsbuf,size) != size) return 0; // broken frame
2326---
2327> if( mp3_read(bsbuf,size) != size) return 0; // broken frame
2328diff -r main/mplayer.c main2/mplayer.c
23291848c1848
2330< unsigned int l;
2331---
2332> int l;
23331948c1948
2334< if(audio_id==-1) audio_id=dvd_aid_from_lang(stream,(unsigned char *)audio_lang);
2335---
2336> if(audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
23371950c1950
2338< if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,(unsigned char *)dvdsub_lang);
2339---
2340> if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
23411993,1994c1993,1994
2342< bname=mp_basename((char *)playlist_entry);
2343< if ((strlen((char *)bname)>10) && !strncmp(bname,"qt",2) && !strncmp(bname+3,"gateQT",6))
2344---
2345> bname=mp_basename(playlist_entry);
2346> if ((strlen(bname)>10) && !strncmp(bname,"qt",2) && !strncmp(bname+3,"gateQT",6))
23472000c2000
2348< entry = play_tree_new();
2349---
2350> entry = play_tree_new();
23512002c2002
2352< if (filename && !strcmp(mp_basename((char *)playlist_entry),(char *)playlist_entry)) // add reference path of current file
2353---
2354> if (filename && !strcmp(mp_basename(playlist_entry),playlist_entry)) // add reference path of current file
23552004c2004
2356< temp=malloc((strlen(filename)-strlen(mp_basename(filename))+strlen((char *)playlist_entry)+1)*sizeof(char));
2357---
2358> temp=malloc((strlen(filename)-strlen(mp_basename(filename))+strlen(playlist_entry)+1)*sizeof(char));
23592007c2007
2360< strncpy(temp, filename, strlen(filename)-strlen((char *)mp_basename((char *)filename)));
2361---
2362> strncpy(temp, filename, strlen(filename)-strlen(mp_basename(filename)));
23632009c2009
2364< strcat(temp, (char *)playlist_entry);
2365---
2366> strcat(temp, playlist_entry);
23672016c2016
2368< play_tree_add_file(entry,(char *)playlist_entry);
2369---
2370> play_tree_add_file(entry,playlist_entry);
23712613c2613
2372< int ret=decode_audio(sh_audio,(unsigned char *)&sh_audio->a_out_buffer[sh_audio->a_out_buffer_len],
2373---
2374> int ret=decode_audio(sh_audio,&sh_audio->a_out_buffer[sh_audio->a_out_buffer_len],
23753016c3016
2376< unsigned int mlen = strlen(msg);
2377---
2378> int mlen = strlen(msg);
2379diff -r main/playtreeparser.c main2/playtreeparser.c
238072c72
2381< r = stream_read(p->stream,(unsigned char*)(p->buffer + p->buffer_end),p->buffer_size - p->buffer_end - 1);
2382---
2383> r = stream_read(p->stream,p->buffer + p->buffer_end,p->buffer_size - p->buffer_end - 1);
2384diff -r main/postproc/swscale_template.c main2/postproc/swscale_template.c
23852263c2263
2386< RENAME(hScale)((int16_t *)dst, dstWidth, src, srcW, xInc, hLumFilter, hLumFilterPos, hLumFilterSize);
2387---
2388> RENAME(hScale)(dst, dstWidth, src, srcW, xInc, hLumFilter, hLumFilterPos, hLumFilterSize);
23892447,2448c2447,2448
2390< RENAME(hScale)((int16_t *)dst , dstWidth, src1, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize);
2391< RENAME(hScale)((int16_t *)dst+2048, dstWidth, src2, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize);
2392---
2393> RENAME(hScale)(dst , dstWidth, src1, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize);
2394> RENAME(hScale)(dst+2048, dstWidth, src2, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize);
23952717c2717
2396< RENAME(hyscale)((uint16_t *)lumPixBuf[ lumBufIndex ], dstW, s, srcW, lumXInc,
2397---
2398> RENAME(hyscale)(lumPixBuf[ lumBufIndex ], dstW, s, srcW, lumXInc,
23992734c2734
2400< RENAME(hcscale)((uint16_t *)chrPixBuf[ chrBufIndex ], chrDstW, src1, src2, chrSrcW, chrXInc,
2401---
2402> RENAME(hcscale)(chrPixBuf[ chrBufIndex ], chrDstW, src1, src2, chrSrcW, chrXInc,
24032759c2759
2404< RENAME(hyscale)((uint16_t *)lumPixBuf[ lumBufIndex ], dstW, s, srcW, lumXInc,
2405---
2406> RENAME(hyscale)(lumPixBuf[ lumBufIndex ], dstW, s, srcW, lumXInc,
24072775c2775
2408< RENAME(hcscale)((uint16_t *)chrPixBuf[ chrBufIndex ], chrDstW, src1, src2, chrSrcW, chrXInc,
2409---
2410> RENAME(hcscale)(chrPixBuf[ chrBufIndex ], chrDstW, src1, src2, chrSrcW, chrXInc,
24112847c2847
2412< RENAME(yuv2packed1)(c, (uint16_t *)*lumSrcPtr, (uint16_t *)*chrSrcPtr, (uint16_t *)*(chrSrcPtr+1),
2413---
2414> RENAME(yuv2packed1)(c, *lumSrcPtr, *chrSrcPtr, *(chrSrcPtr+1),
24152854c2854
2416< RENAME(yuv2packed2)(c, (uint16_t *)*lumSrcPtr, (uint16_t *)*(lumSrcPtr+1), (uint16_t *)*chrSrcPtr, (uint16_t *)*(chrSrcPtr+1),
2417---
2418> RENAME(yuv2packed2)(c, *lumSrcPtr, *(lumSrcPtr+1), *chrSrcPtr, *(chrSrcPtr+1),
2419Seulement dans main: version.h
2420diff -r main/vidix/drivers/pm3_vid.c main2/vidix/drivers/pm3_vid.c
2421286c286
2422< compute_scale_factor(&src_w, &drw_w, (unsigned int *)&shrink, (unsigned int *)&zoom);
2423---
2424> compute_scale_factor(&src_w, &drw_w, &shrink, &zoom);
2425diff -r main/vidix/drivers/unichrome_vid.c main2/vidix/drivers/unichrome_vid.c
2426803c803
2427< uc_ovl_map_hzoom (src_w, drw_w, &zoom, &mini, (int *)&falign, (int *)&dcount);
2428---
2429> uc_ovl_map_hzoom (src_w, drw_w, &zoom, &mini, &falign, &dcount);
2430diff -r main/vobsub.c main2/vobsub.c
24311219c1219
2432< vobsub_set_from_lang(void *vobhandle, char * lang)
2433---
2434> vobsub_set_from_lang(void *vobhandle, unsigned char * lang)
24351221c1221
2436< unsigned int i;
2437---
2438> int i;
2439diff -r main/vobsub.h main2/vobsub.h
244016c16
2441< extern int vobsub_set_from_lang(void *vobhandle, char * lang);
2442---
2443> extern int vobsub_set_from_lang(void *vobhandle, unsigned char * lang);