diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-19 01:48:52 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-19 01:48:52 +0000 |
| commit | 489b07338c1f3dd6110440672a4f8616b6520d4c (patch) | |
| tree | 9f06b6dd38e40dcb0bd8fee4dd85b5fd7a5675cc /TOOLS | |
| parent | a52ed04fcbdabd038c12059a80e1b9547b9fb4d4 (diff) | |
| download | mpv-489b07338c1f3dd6110440672a4f8616b6520d4c.tar.bz2 mpv-489b07338c1f3dd6110440672a4f8616b6520d4c.tar.xz | |
Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
patch by Andriy N. Gritsenko <andrej@lucky.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9015 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
| -rw-r--r-- | TOOLS/vivodump.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TOOLS/vivodump.c b/TOOLS/vivodump.c index 57205fd787..72134b1d00 100644 --- a/TOOLS/vivodump.c +++ b/TOOLS/vivodump.c @@ -149,7 +149,7 @@ int pos=0; 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->biSize=sizeof(BITMAPINFOHEADER); 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 @@ while((c=fgetc(f))>=0){ // 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->biWidth=width; 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); } |