diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-18 21:03:59 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-18 21:03:59 +0000 |
| commit | cf099b21004558223ed3132dc42d37f5f814541e (patch) | |
| tree | 1f69aaeaefe8da1ebb4b82bf63be442783c163c0 /libmpdemux/muxer.c | |
| parent | ac9465059730747f59b07ad00b5daebbbece8c9f (diff) | |
| download | mpv-cf099b21004558223ed3132dc42d37f5f814541e.tar.bz2 mpv-cf099b21004558223ed3132dc42d37f5f814541e.tar.xz | |
muxers now write to output muxer->stream rather than to muxer->file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/muxer.c')
| -rw-r--r-- | libmpdemux/muxer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c index 3e7537307a..0bb34f5254 100644 --- a/libmpdemux/muxer.c +++ b/libmpdemux/muxer.c @@ -11,18 +11,18 @@ #include "aviheader.h" #include "ms_hdr.h" -#include "muxer.h" #include "stream.h" +#include "muxer.h" #include "demuxer.h" #include "mp_msg.h" #include "help_mp.h" #include "stheader.h" -muxer_t *muxer_new_muxer(int type,FILE *f){ +muxer_t *muxer_new_muxer(int type,stream_t *stream){ muxer_t* muxer=calloc(1,sizeof(muxer_t)); if(!muxer) return NULL; - muxer->file = f; + muxer->stream = stream; switch (type) { case MUXER_TYPE_MPEG: if(! muxer_init_muxer_mpeg(muxer)) |