comparison mplayer.c @ 18711:4d87a5c4611c

When playing an audio only file use audio time instead of video time to set EDL mark. Fixes a NULL pointer dereference. Problem noticed by Robert Henney, robh A rut org.
author uau
date Wed, 14 Jun 2006 20:20:28 +0000
parents c528c6c518f1
children cb7da1894b00
comparison
equal deleted inserted replaced
18710:c528c6c518f1 18711:4d87a5c4611c
4230 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_%s=%s\n",cmd->args[0].v.s,tmp); 4230 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_%s=%s\n",cmd->args[0].v.s,tmp);
4231 free(tmp); 4231 free(tmp);
4232 } break; 4232 } break;
4233 case MP_CMD_EDL_MARK: 4233 case MP_CMD_EDL_MARK:
4234 if( edl_fd ) { 4234 if( edl_fd ) {
4235 float v = sh_video->pts; 4235 float v = sh_video ? sh_video->pts :
4236 playing_audio_pts(sh_audio, d_audio, audio_out);
4236 fprintf( edl_fd, "%f %f %d\n", v-2, v, 0 ); 4237 fprintf( edl_fd, "%f %f %d\n", v-2, v, 0 );
4237 } 4238 }
4238 break; 4239 break;
4239 case MP_CMD_SWITCH_RATIO : { 4240 case MP_CMD_SWITCH_RATIO : {
4240 if (cmd->nargs == 0) 4241 if (cmd->nargs == 0)