Mercurial > mplayer.hg
changeset 1330:8940480b3856
d_audio->type stuff fixed
| author | arpi |
|---|---|
| date | Mon, 16 Jul 2001 15:09:34 +0000 |
| parents | 267b7e92edc3 |
| children | b4457de47804 |
| files | demuxer.h mplayer.c |
| diffstat | 2 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/demuxer.h Mon Jul 16 13:34:42 2001 +0000 +++ b/demuxer.h Mon Jul 16 15:09:34 2001 +0000 @@ -44,7 +44,7 @@ demux_packet_t *first; // read to current buffer from here demux_packet_t *last; // append new packets from input stream to here int id; // stream ID (for multiple audio/video streams) - int type; // stream type (currently used only for audio) + int type; // stream type (currently used only for mpg-PS audio) struct demuxer_st *demuxer; // parent demuxer structure (stream handler) // ---- asf ----- demux_packet_t *asf_packet; // read asf fragments here
--- a/mplayer.c Mon Jul 16 13:34:42 2001 +0000 +++ b/mplayer.c Mon Jul 16 15:09:34 2001 +0000 @@ -714,9 +714,6 @@ stream_reset(stream); demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id); stream_seek(demuxer->stream,seek_to_byte); - // Arpi? why is this extra and not in codec selection? - atmos :: - // Hmm. This should be fixed somehow... I'll check diz later. - arpi - if(audio_family!=-1) demuxer->audio->type=audio_family; // override audio format if(ds_fill_buffer(demuxer->video)){ printf("Detected MPEG-PS file format!\n"); file_format=DEMUXER_TYPE_MPEG_PS; @@ -903,7 +900,6 @@ break; } case DEMUXER_TYPE_MPEG_ES: { - d_audio->type=0; has_audio=0;sh_audio=NULL; // ES streams has no audio channel d_video->sh=new_sh_video(demuxer,0); // create dummy video stream header, id=0 break;