RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

d_audio->type stuff fixed 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1331 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2001-07-16 15:09:34 +00:00
parent de73c8eed3
commit 53ecd003df
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demuxer.h
View File

@ -44,7 +44,7 @@ typedef struct {
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

4
mplayer.c
View File

@ -714,9 +714,6 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
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 @@ switch(file_format){
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;