processing audio is sometimes essential for a/v sync, so 1000l to

whoever made rawvideo muxer disable audio!!

with this patch, audio is processed but simply thrown away by the
muxer. various 'error' conditions in rawvideo muxer are removed to
make it work. feel free to re-add them if they can be done without
breaking anything, but do not use printf !!!!

btw old behavior can be obtained by manually specifying -nosound.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16806 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 1 insertions, 11 deletions

diff --git a/libmpdemux/muxer_rawvideo.c b/libmpdemux/muxer_rawvideo.c
index b3f41e7545..eff3eb019f 100644
--- a/libmpdemux/muxer_rawvideo.c
+++ b/libmpdemux/muxer_rawvideo.c
@@ -21,14 +21,6 @@
 static muxer_stream_t* rawvideofile_new_stream(muxer_t *muxer,int type){
     muxer_stream_t* s;
     if (!muxer) return NULL;
-    if (type == MUXER_TYPE_AUDIO) {
-	printf("Rawvideo muxer does not support audio !\n");
-	return NULL;
-    }
-    if(muxer->avih.dwStreams>=1){
-	printf("Too many streams! Rawvideo muxer supports only one video stream !\n");
-	return NULL;
-    }
     s=malloc(sizeof(muxer_stream_t));
     memset(s,0,sizeof(muxer_stream_t));
     if(!s) return NULL; // no mem!?
@@ -44,9 +36,6 @@ static muxer_stream_t* rawvideofile_new_stream(muxer_t *muxer,int type){
       s->h.fccType=streamtypeVIDEO;
       if(!muxer->def_v) muxer->def_v=s;
       break;
-    default:
-      printf("WarninG! unknown stream type: %d\n",type);
-      return NULL;
     }
     muxer->avih.dwStreams++;
     return s;
@@ -65,6 +54,7 @@ static void rawvideofile_write_chunk(muxer_stream_t *s,size_t len,unsigned int f
     muxer_t *muxer=s->muxer;
 
     // write out the chunk:
+    if (s->type == MUXER_TYPE_VIDEO)
     write_rawvideo_chunk(muxer->file,len,s->buffer); /* unsigned char */
 
     // alter counters: