[MPlayer-cvslog] r26331 - in trunk/libmpdemux: demux_aac.c demux_film.c demux_nuv.c demux_pva.c demux_rawaudio.c demux_rawdv.c demux_roq.c demux_smjpeg.c demux_vqf.c

[reimar]

Author: reimar
Date: Sat Apr  5 16:11:48 2008
New Revision: 26331

Log:
Fix lots and lots of other demuxers broken by r26301


Modified:
   trunk/libmpdemux/demux_aac.c
   trunk/libmpdemux/demux_film.c
   trunk/libmpdemux/demux_nuv.c
   trunk/libmpdemux/demux_pva.c
   trunk/libmpdemux/demux_rawaudio.c
   trunk/libmpdemux/demux_rawdv.c
   trunk/libmpdemux/demux_roq.c
   trunk/libmpdemux/demux_smjpeg.c
   trunk/libmpdemux/demux_vqf.c

Modified: trunk/libmpdemux/demux_aac.c
==============================================================================
--- trunk/libmpdemux/demux_aac.c	(original)
+++ trunk/libmpdemux/demux_aac.c	Sat Apr  5 16:11:48 2008
@@ -136,6 +136,7 @@ static demuxer_t* demux_aac_open(demuxer
 	sh = new_sh_audio(demuxer, 0);
 	sh->ds = demuxer->audio;
 	sh->format = mmioFOURCC('M', 'P', '4', 'A');
+	demuxer->audio->id = 0;
 	demuxer->audio->sh = sh;
 
 	demuxer->filepos = stream_tell(demuxer->stream);

Modified: trunk/libmpdemux/demux_film.c
==============================================================================
--- trunk/libmpdemux/demux_film.c	(original)
+++ trunk/libmpdemux/demux_film.c	Sat Apr  5 16:11:48 2008
@@ -307,6 +307,7 @@ static demuxer_t* demux_open_film(demuxe
         {
           // create and initialize the audio stream header
           sh_audio = new_sh_audio(demuxer, 0);
+          demuxer->audio->id = 0;
           demuxer->audio->sh = sh_audio;
           sh_audio->ds = demuxer->audio;
 

Modified: trunk/libmpdemux/demux_nuv.c
==============================================================================
--- trunk/libmpdemux/demux_nuv.c	(original)
+++ trunk/libmpdemux/demux_nuv.c	Sat Apr  5 16:11:48 2008
@@ -369,6 +369,7 @@ static demuxer_t* demux_open_nuv ( demux
 	if (rtjpeg_fileheader.audioblocks != 0)
 	{
 	    sh_audio = new_sh_audio(demuxer, 0);
+	    demuxer->audio->id = 0;
 	    demuxer->audio->sh = sh_audio;
 	    sh_audio->ds = demuxer->audio;
 	    sh_audio->format = 0x1;

Modified: trunk/libmpdemux/demux_pva.c
==============================================================================
--- trunk/libmpdemux/demux_pva.c	(original)
+++ trunk/libmpdemux/demux_pva.c	Sat Apr  5 16:11:48 2008
@@ -170,6 +170,7 @@ static demuxer_t * demux_open_pva (demux
 	printf("demuxer->audio->id==%d\n",demuxer->audio->id);
 	*/
 	
+	demuxer->audio->id = 0;
 	demuxer->audio->sh=sh_audio;
 	sh_audio->format=0x50;
 	sh_audio->ds=demuxer->audio;

Modified: trunk/libmpdemux/demux_rawaudio.c
==============================================================================
--- trunk/libmpdemux/demux_rawaudio.c	(original)
+++ trunk/libmpdemux/demux_rawaudio.c	Sat Apr  5 16:11:48 2008
@@ -53,6 +53,7 @@ static demuxer_t* demux_rawaudio_open(de
   demuxer->movi_start = demuxer->stream->start_pos;
   demuxer->movi_end = demuxer->stream->end_pos;
 
+  demuxer->audio->id = 0;
   demuxer->audio->sh = sh_audio;
   sh_audio->ds = demuxer->audio;
 

Modified: trunk/libmpdemux/demux_rawdv.c
==============================================================================
--- trunk/libmpdemux/demux_rawdv.c	(original)
+++ trunk/libmpdemux/demux_rawdv.c	Sat Apr  5 16:11:48 2008
@@ -195,6 +195,7 @@ static demuxer_t* demux_open_rawdv(demux
    mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() seek to %qu, size: %d, dv_dec->frame_size: %d\n",frames->current_filepos,frames->frame_size, dv_decoder->frame_size);
     if (dv_decoder->audio != NULL && demuxer->audio->id>=-1){
        sh_audio_t *sh_audio =  new_sh_audio(demuxer, 0);
+       demuxer->audio->id = 0;
 	    demuxer->audio->sh = sh_audio;
 	    sh_audio->ds = demuxer->audio;
        mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() chan: %d samplerate: %d\n",dv_decoder->audio->num_channels,dv_decoder->audio->frequency );

Modified: trunk/libmpdemux/demux_roq.c
==============================================================================
--- trunk/libmpdemux/demux_roq.c	(original)
+++ trunk/libmpdemux/demux_roq.c	Sat Apr  5 16:11:48 2008
@@ -154,6 +154,7 @@ static demuxer_t* demux_open_roq(demuxer
         // make the header first
         sh_audio = new_sh_audio(demuxer, 0);
         // make sure the demuxer knows about the new stream header
+        demuxer->audio->id = 0;
         demuxer->audio->sh = sh_audio;
         // make sure that the audio demuxer stream header knows about its
         // parent audio demuxer stream

Modified: trunk/libmpdemux/demux_smjpeg.c
==============================================================================
--- trunk/libmpdemux/demux_smjpeg.c	(original)
+++ trunk/libmpdemux/demux_smjpeg.c	Sat Apr  5 16:11:48 2008
@@ -137,6 +137,7 @@ static demuxer_t* demux_open_smjpeg(demu
 	    break;
 	case mmioFOURCC('_','S','N','D'):
 	    sh_audio = new_sh_audio(demuxer, 0);
+	    demuxer->audio->id = 0;
 	    demuxer->audio->sh = sh_audio;
 	    sh_audio->ds = demuxer->audio;
 

Modified: trunk/libmpdemux/demux_vqf.c
==============================================================================
--- trunk/libmpdemux/demux_vqf.c	(original)
+++ trunk/libmpdemux/demux_vqf.c	Sat Apr  5 16:11:48 2008
@@ -153,6 +153,7 @@ static demuxer_t* demux_open_vqf(demuxer
     }
   }
 
+  demuxer->audio->id = 0;
   demuxer->audio->sh = sh_audio;
   sh_audio->ds = demuxer->audio;
   stream_seek(s,demuxer->movi_start);