mirror of
https://github.com/game-stop/veejay.git
synced 2025-12-17 13:20:01 +01:00
sample stream conflict fix with fonts
git-svn-id: svn://code.dyne.org/veejay/trunk@956 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
@@ -687,7 +687,7 @@ static int veejay_start_playing_stream(veejay_t *info, int stream_id )
|
||||
settings->max_frame_num = vj_tag_get_n_frames( stream_id );
|
||||
|
||||
#ifdef HAVE_FREETYPE
|
||||
if(info->font && info->uc->sample_id != stream_id )
|
||||
if(info->font )
|
||||
{
|
||||
void *dict = vj_tag_get_dict( stream_id );
|
||||
vj_font_set_constraints_and_dict( info->font, settings->min_frame_num,
|
||||
|
||||
@@ -1491,7 +1491,6 @@ void vj_font_set_constraints_and_dict( void *font, long lo, long hi, float fps,
|
||||
veejay_msg(VEEJAY_MSG_DEBUG, "Subtitle: Dictionary %p, Lo = %ld , Hi = %ld, Fps = %f, font = %p",
|
||||
dict, lo,hi, fps , font);
|
||||
|
||||
|
||||
f->fps = fps;
|
||||
|
||||
if( f->dictionary )
|
||||
|
||||
Reference in New Issue
Block a user