[MPlayer-cvslog] CVS: main mencoder.c,1.325,1.326

Oded Shimon CVS syncmail at mplayerhq.hu
Wed Dec 7 11:07:30 CET 2005


CVS change done by Oded Shimon CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv27274

Modified Files:
	mencoder.c 
Log Message:
more warning fixes


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- mencoder.c	7 Dec 2005 09:56:44 -0000	1.325
+++ mencoder.c	7 Dec 2005 10:07:27 -0000	1.326
@@ -1142,7 +1142,7 @@
 
 			len = dec_audio(sh_audio, aencoder->decode_buffer, len);
 			mux_a->buffer_len += aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, 
-				(void*)aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len);
+				aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len);
 			if(mux_a->buffer_len < mux_a->wf->nBlockAlign)
 				len = 0;
 			else 
@@ -1167,7 +1167,7 @@
 					len = 0;
 					break;
 				}
-				len = aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, (void*)aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len);
+				len = aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len);
 				mux_a->buffer_len += len;
 			}
 	    }




More information about the MPlayer-cvslog mailing list