[Mplayer-cvslog] CVS: main/TOOLS vivodump.c,1.6,1.7

[Arpi of Ize]

Update of /cvsroot/mplayer/main/TOOLS
In directory mail:/var/tmp.root/cvs-serv7598/TOOLS

Modified Files:
	vivodump.c 
Log Message:
Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
patch by Andriy N. Gritsenko <andrej at lucky.net>


Index: vivodump.c
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/vivodump.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vivodump.c	27 Dec 2002 22:43:17 -0000	1.6
+++ vivodump.c	19 Jan 2003 01:48:51 -0000	1.7
@@ -149,7 +149,7 @@
 int frames=0;
 FILE *f=fopen("paulvandykforanangel.viv","rb");
 FILE *f2=fopen("GB1.avi","wb");
-muxer_t* avi=muxer_new_muxer(MUXER_TYPE_AVI);
+muxer_t* avi=muxer_new_muxer(MUXER_TYPE_AVI,f2);
 muxer_stream_t* mux=muxer_new_stream(avi,MUXER_TYPE_VIDEO);
 //unsigned char* buffer=malloc(0x200000);
 int i,len;
@@ -169,7 +169,7 @@
 mux->bih->biPlanes=1;
 mux->bih->biBitCount=24;
 mux->bih->biCompression=0x6f766976;//      7669766f;
-muxer_write_header(avi,f2);
+muxer_write_header(avi);
 
 /*
 c=fgetc(f); if(c) printf("error! not vivo file?\n");
@@ -222,7 +222,7 @@
 	// end of frame:
 	printf("Frame size: %d\n",mux->buffer_len);
 	h263_decode_picture_header(mux->buffer);
-	muxer_write_chunk(avi,mux,f2,mux->buffer_len,0x10);
+	muxer_write_chunk(mux,mux->buffer_len,0x10);
 	mux->buffer_len=0;
 	
 	if((v_id&0xF0)==0x10) fprintf(stderr,"hmm. last video packet %02X\n",v_id);
@@ -258,8 +258,8 @@
 mux->bih->biHeight=height;
 mux->bih->biSizeImage=3*width*height;
 
-muxer_write_index(avi,f2);
+muxer_write_index(avi);
 fseek(f2,0,SEEK_SET);
-muxer_write_header(avi,f2);
+muxer_write_header(avi);
 
 }