summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-27 12:38:29 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-27 12:38:29 +0000
commitfdd23f29ba6d7467750a2e7c89666ea2a401c429 (patch)
treecb245080e5e539c8f1790a325f91e6b3441b2134 /libmpdemux/demuxer.c
parent27be573c3ba830142821a169224bf59961fe3235 (diff)
downloadmpv-fdd23f29ba6d7467750a2e7c89666ea2a401c429.tar.bz2
mpv-fdd23f29ba6d7467750a2e7c89666ea2a401c429.tar.xz
setting sh_audio to NULL is nonsense, since it is only a local variable,
use d_audio->sh instead. Fixes crash for incoming/VTS_01_1_orig.VOB, though it still doesn't select the other audio stream automatically. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15577 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 268e8f1f4d..7927160dce 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -1291,14 +1291,14 @@ switch(file_format){
demux_open_lmlm4(demuxer);
if(!ds_fill_buffer(d_video)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,"LMLM4: " MSGTR_MissingVideoStream);
- sh_video=NULL;
+ d_video->sh=NULL;
} else {
sh_video=d_video->sh;sh_video->ds=d_video;
}
if(audio_id!=-2) {
if(!ds_fill_buffer(d_audio)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,"LMLM4: " MSGTR_MissingAudioStream);
- sh_audio=NULL;
+ d_audio->sh=NULL;
} else {
sh_audio=d_audio->sh;sh_audio->ds=d_audio;
}
@@ -1319,7 +1319,7 @@ switch(file_format){
if(d_video->id != -2) {
if(!ds_fill_buffer(d_video)){
mp_msg(MSGT_DEMUXER,MSGL_WARN,"ASF: " MSGTR_MissingVideoStream);
- sh_video=NULL;
+ d_video->sh=NULL;
//printf("ASF: missing video stream!? contact the author, it may be a bug :(\n");
} else {
sh_video=d_video->sh;sh_video->ds=d_video;
@@ -1331,7 +1331,7 @@ switch(file_format){
mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_ASFSearchingForAudioStream,d_audio->id);
if(!ds_fill_buffer(d_audio)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,"ASF: " MSGTR_MissingAudioStream);
- sh_audio=NULL;
+ d_audio->sh=NULL;
} else {
sh_audio=d_audio->sh;sh_audio->ds=d_audio;
sh_audio->format=sh_audio->wf->wFormatTag;
@@ -1342,7 +1342,7 @@ switch(file_format){
case DEMUXER_TYPE_H264_ES:
case DEMUXER_TYPE_MPEG4_ES:
case DEMUXER_TYPE_MPEG_ES: {
- sh_audio=NULL; // ES streams has no audio channel
+ d_audio->sh=NULL; // ES streams has no audio channel
d_video->sh=new_sh_video(demuxer,0); // create dummy video stream header, id=0
sh_video=d_video->sh;sh_video->ds=d_video;
break;
@@ -1356,7 +1356,7 @@ switch(file_format){
if(audio_id!=-2) {
if(!ds_fill_buffer(d_audio)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream);
- sh_audio=NULL;
+ d_audio->sh=NULL;
} else {
sh_audio=d_audio->sh;sh_audio->ds=d_audio;
}