diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-21 21:45:49 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-21 21:45:49 +0000 |
commit | 10069de306ed73689d8b62dd5ae72814e6ed03d1 (patch) | |
tree | 4006f167d138393e040bebd2a4ebd6ed00e0be34 /libmpdemux/muxer.c | |
parent | 4dc848b8033d0f67ce1639a7505442be8ba3e87c (diff) | |
download | mpv-10069de306ed73689d8b62dd5ae72814e6ed03d1.tar.bz2 mpv-10069de306ed73689d8b62dd5ae72814e6ed03d1.tar.xz |
new mpeg muxer compatible with dvd/[s]vcd; small changes in the muxer layer (sanity checks in the muxer_init functions)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14754 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/muxer.c')
-rw-r--r-- | libmpdemux/muxer.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c index 23fbce98ba..7209a07e05 100644 --- a/libmpdemux/muxer.c +++ b/libmpdemux/muxer.c @@ -12,6 +12,11 @@ #include "ms_hdr.h" #include "muxer.h" +#include "stream.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=malloc(sizeof(muxer_t)); @@ -19,14 +24,17 @@ muxer_t *muxer_new_muxer(int type,FILE *f){ muxer->file = f; switch (type) { case MUXER_TYPE_MPEG: - muxer_init_muxer_mpeg(muxer); + if(! muxer_init_muxer_mpeg(muxer)) + return NULL; break; case MUXER_TYPE_RAWVIDEO: - muxer_init_muxer_rawvideo(muxer); + if(! muxer_init_muxer_rawvideo(muxer)) + return NULL; break; case MUXER_TYPE_AVI: default: - muxer_init_muxer_avi(muxer); + if(! muxer_init_muxer_avi(muxer)) + return NULL; } return muxer; } |