Mercurial > mplayer.hg

comparison libmpdemux/muxer.c @ 21660:ca9da45d13e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
muxers now write to output muxer->stream rather than to muxer->file
author nicodvb
date Mon, 18 Dec 2006 21:03:59 +0000
parents 4928dd61f136
children 4d81dbdf46b9
comparison
equal deleted inserted replaced
21659:da09e69a0f01 21660:ca9da45d13e9
9 #include "version.h" 9 #include "version.h"
10 10
11 #include "aviheader.h" 11 #include "aviheader.h"
12 #include "ms_hdr.h" 12 #include "ms_hdr.h"
13 13
14 #include "stream.h"
14 #include "muxer.h" 15 #include "muxer.h"
15 #include "stream.h"
16 #include "demuxer.h" 16 #include "demuxer.h"
17 #include "mp_msg.h" 17 #include "mp_msg.h"
18 #include "help_mp.h" 18 #include "help_mp.h"
19 #include "stheader.h" 19 #include "stheader.h"
20 20
21 muxer_t *muxer_new_muxer(int type,FILE *f){ 21 muxer_t *muxer_new_muxer(int type,stream_t *stream){
22 muxer_t* muxer=calloc(1,sizeof(muxer_t)); 22 muxer_t* muxer=calloc(1,sizeof(muxer_t));
23 if(!muxer) 23 if(!muxer)
24 return NULL; 24 return NULL;
25 muxer->file = f; 25 muxer->stream = stream;
26 switch (type) { 26 switch (type) {
27 case MUXER_TYPE_MPEG: 27 case MUXER_TYPE_MPEG:
28 if(! muxer_init_muxer_mpeg(muxer)) 28 if(! muxer_init_muxer_mpeg(muxer))
29 goto fail; 29 goto fail;
30 break; 30 break;