github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-02 16:25:33 +02:00
Code Releases Activity

Fix lots and lots of other demuxers broken by r26301

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26331 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-04-05 14:11:48 +00:00
parent 42234b5198
commit 02fe2aae9f
9 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libmpdemux/demux_aac.c
View 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);

1
libmpdemux/demux_film.c
View 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;

1
libmpdemux/demux_nuv.c
View 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;

1
libmpdemux/demux_pva.c
View 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;

1
libmpdemux/demux_rawaudio.c
View 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;

1
libmpdemux/demux_rawdv.c
View 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 );

1
libmpdemux/demux_roq.c
View 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

1
libmpdemux/demux_smjpeg.c
View 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;

1
libmpdemux/demux_vqf.c
View 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);