Mercurial > mplayer.hg

comparison libmpdemux/demux_mov.c @ 36811:92dd1764392a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demuxers: remove pointless sh->ds assignments. The new_sh_* functions have been fixed a long time ago to do this.
author reimar
date Sun, 23 Feb 2014 18:14:44 +0000
parents 689594b793f7
children
comparison
equal deleted inserted replaced
36810:576724706b75 36811:92dd1764392a
942 } 942 }
943 // Selection: 943 // Selection:
944 // if(demuxer->audio->id==-1 || demuxer->audio->id==priv->track_db){ 944 // if(demuxer->audio->id==-1 || demuxer->audio->id==priv->track_db){
945 // // (auto)selected audio track: 945 // // (auto)selected audio track:
946 // demuxer->audio->id=priv->track_db; 946 // demuxer->audio->id=priv->track_db;
947 // demuxer->audio->sh=sh; sh->ds=demuxer->audio; 947 // demuxer->audio->sh=sh;
948 // } 948 // }
949 return 1; 949 return 1;
950 } 950 }
951 951
952 static int gen_sh_video(sh_video_t* sh, mov_track_t* trak, int timescale) { 952 static int gen_sh_video(sh_video_t* sh, mov_track_t* trak, int timescale) {
1275 mp_msg(MSGT_DEMUX, MSGL_V, "Fourcc: %.4s Codec: '%.*s'\n",(char *)&trak->fourcc,trak->stdata[42]&31,trak->stdata+43); 1275 mp_msg(MSGT_DEMUX, MSGL_V, "Fourcc: %.4s Codec: '%.*s'\n",(char *)&trak->fourcc,trak->stdata[42]&31,trak->stdata+43);
1276 1276
1277 // if(demuxer->video->id==-1 || demuxer->video->id==priv->track_db){ 1277 // if(demuxer->video->id==-1 || demuxer->video->id==priv->track_db){
1278 // // (auto)selected video track: 1278 // // (auto)selected video track:
1279 // demuxer->video->id=priv->track_db; 1279 // demuxer->video->id=priv->track_db;
1280 // demuxer->video->sh=sh; sh->ds=demuxer->video; 1280 // demuxer->video->sh=sh;
1281 // } 1281 // }
1282 return 1; 1282 return 1;
1283 } 1283 }
1284 1284
1285 static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak){ 1285 static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak){
1979 1979
1980 // setup sh pointers: 1980 // setup sh pointers:
1981 if(demuxer->audio->id>=0){ 1981 if(demuxer->audio->id>=0){
1982 sh_audio_t* sh=demuxer->a_streams[demuxer->audio->id]; 1982 sh_audio_t* sh=demuxer->a_streams[demuxer->audio->id];
1983 if(sh){ 1983 if(sh){
1984 demuxer->audio->sh=sh; sh->ds=demuxer->audio; 1984 demuxer->audio->sh=sh;
1985 } else { 1985 } else {
1986 mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected audio stream (%d) does not exist\n",demuxer->audio->id); 1986 mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected audio stream (%d) does not exist\n",demuxer->audio->id);
1987 demuxer->audio->id=-2; 1987 demuxer->audio->id=-2;
1988 } 1988 }
1989 } 1989 }
1990 if(demuxer->video->id>=0){ 1990 if(demuxer->video->id>=0){
1991 sh_video_t* sh=demuxer->v_streams[demuxer->video->id]; 1991 sh_video_t* sh=demuxer->v_streams[demuxer->video->id];
1992 if(sh){ 1992 if(sh){
1993 demuxer->video->sh=sh; sh->ds=demuxer->video; 1993 demuxer->video->sh=sh;
1994 } else { 1994 } else {
1995 mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected video stream (%d) does not exist\n",demuxer->video->id); 1995 mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected video stream (%d) does not exist\n",demuxer->video->id);
1996 demuxer->video->id=-2; 1996 demuxer->video->id=-2;
1997 } 1997 }
1998 } 1998 }