From 02fe2aae9fda33a48455360a3bd3e7995ca0ab9b Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 5 Apr 2008 14:11:48 +0000
Subject: Fix lots and lots of other demuxers broken by r26301

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26331 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_aac.c      | 1 +
 libmpdemux/demux_film.c     | 1 +
 libmpdemux/demux_nuv.c      | 1 +
 libmpdemux/demux_pva.c      | 1 +
 libmpdemux/demux_rawaudio.c | 1 +
 libmpdemux/demux_rawdv.c    | 1 +
 libmpdemux/demux_roq.c      | 1 +
 libmpdemux/demux_smjpeg.c   | 1 +
 libmpdemux/demux_vqf.c      | 1 +
 9 files changed, 9 insertions(+)

diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c
index 446efc3510..0226abdb79 100644
--- a/libmpdemux/demux_aac.c
+++ b/libmpdemux/demux_aac.c
@@ -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);
diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c
index ba5b899159..e6285a759a 100644
--- a/libmpdemux/demux_film.c
+++ b/libmpdemux/demux_film.c
@@ -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;
 
diff --git a/libmpdemux/demux_nuv.c b/libmpdemux/demux_nuv.c
index 94112c3874..2ca1d2b452 100644
--- a/libmpdemux/demux_nuv.c
+++ b/libmpdemux/demux_nuv.c
@@ -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;
diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c
index 15301c0a59..2ff8be63e3 100644
--- a/libmpdemux/demux_pva.c
+++ b/libmpdemux/demux_pva.c
@@ -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;
diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c
index 5c3375df3e..9dd6543577 100644
--- a/libmpdemux/demux_rawaudio.c
+++ b/libmpdemux/demux_rawaudio.c
@@ -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;
 
diff --git a/libmpdemux/demux_rawdv.c b/libmpdemux/demux_rawdv.c
index a21aaabdfd..503a906fe1 100644
--- a/libmpdemux/demux_rawdv.c
+++ b/libmpdemux/demux_rawdv.c
@@ -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 );
diff --git a/libmpdemux/demux_roq.c b/libmpdemux/demux_roq.c
index fac1985f0a..0dfd7f544b 100644
--- a/libmpdemux/demux_roq.c
+++ b/libmpdemux/demux_roq.c
@@ -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
diff --git a/libmpdemux/demux_smjpeg.c b/libmpdemux/demux_smjpeg.c
index 7d88865e47..205ab98459 100644
--- a/libmpdemux/demux_smjpeg.c
+++ b/libmpdemux/demux_smjpeg.c
@@ -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;
 
diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c
index f706f76ca3..013929a3bc 100644
--- a/libmpdemux/demux_vqf.c
+++ b/libmpdemux/demux_vqf.c
@@ -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);
-- 
cgit v1.2.3