diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-27 22:43:20 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-27 22:43:20 +0000 |
| commit | bf46a109ede5d25f506cc75ae80fe1acc5b34edd (patch) | |
| tree | a2cd8454df8950c0ab1ced5add63f293ea35d242 /TOOLS | |
| parent | bc9afe8d39c9e12596677be1141f8098fec73db6 (diff) | |
| download | mpv-bf46a109ede5d25f506cc75ae80fe1acc5b34edd.tar.bz2 mpv-bf46a109ede5d25f506cc75ae80fe1acc5b34edd.tar.xz | |
the long-waited MUXER layer, and new MPEG-PS muxer
patch by Andriy N. Gritsenko <andrej@lucky.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8586 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
| -rw-r--r-- | TOOLS/vivodump.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/TOOLS/vivodump.c b/TOOLS/vivodump.c index c0c3417392..57205fd787 100644 --- a/TOOLS/vivodump.c +++ b/TOOLS/vivodump.c @@ -6,7 +6,7 @@ #include "wine/avifmt.h" #include "wine/vfw.h" -#include "aviwrite.h" +#include "muxer.h" static const short h263_format[8][2] = { { 0, 0 }, @@ -149,8 +149,8 @@ int pos=0; int frames=0; FILE *f=fopen("paulvandykforanangel.viv","rb"); FILE *f2=fopen("GB1.avi","wb"); -aviwrite_t* avi=aviwrite_new_muxer(); -aviwrite_stream_t* mux=aviwrite_new_stream(avi,AVIWRITE_TYPE_VIDEO); +muxer_t* avi=muxer_new_muxer(MUXER_TYPE_AVI); +muxer_stream_t* mux=muxer_new_stream(avi,MUXER_TYPE_VIDEO); //unsigned char* buffer=malloc(0x200000); int i,len; int v_id=0; @@ -169,7 +169,7 @@ mux->bih->biSize=sizeof(BITMAPINFOHEADER); mux->bih->biPlanes=1; mux->bih->biBitCount=24; mux->bih->biCompression=0x6f766976;// 7669766f; -aviwrite_write_header(avi,f2); +muxer_write_header(avi,f2); /* 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); - aviwrite_write_chunk(avi,mux,f2,mux->buffer_len,0x10); + muxer_write_chunk(avi,mux,f2,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; -aviwrite_write_index(avi,f2); +muxer_write_index(avi,f2); fseek(f2,0,SEEK_SET); -aviwrite_write_header(avi,f2); +muxer_write_header(avi,f2); } |