comparison command.c @ 29668:ecc719c6d7a9

Make update_subtitles work without sh_video for text subtitles. This fixes a crash with e.g. auto-enabled subtitles and -novideo due to command.c calling update_subtitles even without video and is a step toward subtitle support for audio-only files.

29667:8cfbe411de01

			   MPContext * mpctx)
{
    demux_stream_t *const d_sub = mpctx->d_sub;
    const int global_sub_size = mpctx->global_sub_size;
    int source = -1, reset_spu = 0;
    char *sub_name;

    if (global_sub_size <= 0)
	return M_PROPERTY_UNAVAILABLE;

	&& dvdsub_id < 0 && reset_spu) {
	dvdsub_id = -2;
	d_sub->id = dvdsub_id;
    }
#endif
    update_subtitles(mpctx->sh_video, d_sub, 1);

    return M_PROPERTY_OK;
}

/// Selected sub source (RW)

29668:ecc719c6d7a9

			   MPContext * mpctx)
{
    demux_stream_t *const d_sub = mpctx->d_sub;
    const int global_sub_size = mpctx->global_sub_size;
    int source = -1, reset_spu = 0;
    double pts = 0;
    char *sub_name;

    if (global_sub_size <= 0)
	return M_PROPERTY_UNAVAILABLE;

	&& dvdsub_id < 0 && reset_spu) {
	dvdsub_id = -2;
	d_sub->id = dvdsub_id;
    }
#endif
    if (mpctx->sh_audio)
        pts = mpctx->sh_audio->pts;
    if (mpctx->sh_video)
        pts = mpctx->sh_video->pts;
    update_subtitles(mpctx->sh_video, pts, d_sub, 1);

    return M_PROPERTY_OK;
}

/// Selected sub source (RW)