[MPlayer-cvslog] r33581 - trunk/mplayer.c

[Reimar Döffinger]

On Sat, Jun 11, 2011 at 05:44:10PM +0200, Clément Bœsch wrote:
> On Sat, Jun 11, 2011 at 05:41:00PM +0200, Clément Bœsch wrote:
> > On Sat, Jun 11, 2011 at 05:07:41PM +0200, reimar wrote:
> > > Author: reimar
> > > Date: Sat Jun 11 17:07:37 2011
> > > New Revision: 33581
> > > 
> > > Log:
> > > a_pos is also used by update_subtitles, so initialize it always.
> > > 
> > > Modified:
> > >    trunk/mplayer.c
> > > 
> > > Modified: trunk/mplayer.c
> > > ==============================================================================
> > > --- trunk/mplayer.c	Sat Jun 11 16:54:59 2011	(r33580)
> > > +++ trunk/mplayer.c	Sat Jun 11 17:07:37 2011	(r33581)
> > > @@ -3796,7 +3796,7 @@ goto_enable_cache:
> > >                  double a_pos = 0;
> > >                  // sh_audio can be NULL due to video stream switching
> > >                  // TODO: handle this better
> > > -                if ((!quiet || end_at.type == END_AT_TIME) && mpctx->sh_audio)
> > > +                if (mpctx->sh_audio)
> > >                      a_pos = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
> > >  
> > >                  if (!quiet)
> > 
> > This sounds weird to me; we are in the case where there is no video. Is
> > there a chance the audio is not set too? Also, why update subtitles if no
> > video?
> > 
> 
> I should have read the comment, forget my question.

I guess the comment mostly answers your first question
(it is a bit unfortunate that we can end up with neither audio nor
video, causes some ugly special-cases).
And as to the other one: In case you were not aware, text subtitles
can be output on the terminal, potentially useful for audio-only with
karaoke subtitles or similar.