Mercurial > mplayer.hg
changeset 26299:4d56038ec730
Fix lots and lots of other demuxers broken by r26301
| author | reimar |
|---|---|
| date | Sat, 05 Apr 2008 14:11:48 +0000 |
| parents | 5222bb9c5500 |
| children | 36dae6fb85af |
| files | 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 |
| diffstat | 9 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_aac.c Sat Apr 05 14:07:34 2008 +0000 +++ b/libmpdemux/demux_aac.c Sat Apr 05 14:11:48 2008 +0000 @@ -136,6 +136,7 @@ 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);
--- a/libmpdemux/demux_film.c Sat Apr 05 14:07:34 2008 +0000 +++ b/libmpdemux/demux_film.c Sat Apr 05 14:11:48 2008 +0000 @@ -307,6 +307,7 @@ { // 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;
--- a/libmpdemux/demux_nuv.c Sat Apr 05 14:07:34 2008 +0000 +++ b/libmpdemux/demux_nuv.c Sat Apr 05 14:11:48 2008 +0000 @@ -369,6 +369,7 @@ 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;
--- a/libmpdemux/demux_pva.c Sat Apr 05 14:07:34 2008 +0000 +++ b/libmpdemux/demux_pva.c Sat Apr 05 14:11:48 2008 +0000 @@ -170,6 +170,7 @@ 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;
--- a/libmpdemux/demux_rawaudio.c Sat Apr 05 14:07:34 2008 +0000 +++ b/libmpdemux/demux_rawaudio.c Sat Apr 05 14:11:48 2008 +0000 @@ -53,6 +53,7 @@ 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;
--- a/libmpdemux/demux_rawdv.c Sat Apr 05 14:07:34 2008 +0000 +++ b/libmpdemux/demux_rawdv.c Sat Apr 05 14:11:48 2008 +0000 @@ -195,6 +195,7 @@ 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 );
--- a/libmpdemux/demux_roq.c Sat Apr 05 14:07:34 2008 +0000 +++ b/libmpdemux/demux_roq.c Sat Apr 05 14:11:48 2008 +0000 @@ -154,6 +154,7 @@ // 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
--- a/libmpdemux/demux_smjpeg.c Sat Apr 05 14:07:34 2008 +0000 +++ b/libmpdemux/demux_smjpeg.c Sat Apr 05 14:11:48 2008 +0000 @@ -137,6 +137,7 @@ 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;