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;
 }