Fix lots and lots of other demuxers broken by r26301
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Sat, 5 Apr 2008 14:11:48 +0000 (14:11 +0000)
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Sat, 5 Apr 2008 14:11:48 +0000 (14:11 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@26331 b3059339-0415-0410-9bf9-f77b7e298cf2

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

index 446efc3..0226abd 100644 (file)
@@ -136,6 +136,7 @@ static demuxer_t* demux_aac_open(demuxer_t *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);
index ba5b899..e6285a7 100644 (file)
@@ -307,6 +307,7 @@ static demuxer_t* demux_open_film(demuxer_t* demuxer)
         {
           // 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;
 
index 94112c3..2ca1d2b 100644 (file)
@@ -369,6 +369,7 @@ static demuxer_t* demux_open_nuv ( demuxer_t* demuxer )
        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;
index 15301c0..2ff8be6 100644 (file)
@@ -170,6 +170,7 @@ static demuxer_t * demux_open_pva (demuxer_t * demuxer)
        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;
index 5c3375d..9dd6543 100644 (file)
@@ -53,6 +53,7 @@ static demuxer_t* demux_rawaudio_open(demuxer_t* demuxer) {
   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;
 
index a21aaab..503a906 100644 (file)
@@ -195,6 +195,7 @@ static demuxer_t* demux_open_rawdv(demuxer_t* demuxer)
    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 );
index fac1985..0dfd7f5 100644 (file)
@@ -154,6 +154,7 @@ static demuxer_t* demux_open_roq(demuxer_t* 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
index 7d88865..205ab98 100644 (file)
@@ -137,6 +137,7 @@ static demuxer_t* demux_open_smjpeg(demuxer_t* demuxer){
            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;
 
index f706f76..013929a 100644 (file)
@@ -153,6 +153,7 @@ static demuxer_t* demux_open_vqf(demuxer_t* demuxer) {
     }
   }
 
+  demuxer->audio->id = 0;
   demuxer->audio->sh = sh_audio;
   sh_audio->ds = demuxer->audio;
   stream_seek(s,demuxer->movi_start);