eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-18 05:40:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

sample stream conflict fix with fonts

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@956 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2007-04-09 12:08:37 +00:00
parent f383737165
commit d3e9f5a093
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
veejay-1.0/veejay-server/veejay/liblavplayvj.c
View File

@@ -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 ); settings->max_frame_num = vj_tag_get_n_frames( stream_id );
#ifdef HAVE_FREETYPE #ifdef HAVE_FREETYPE
if(info->font && info->uc->sample_id != stream_id ) if(info->font )
{ {
void *dict = vj_tag_get_dict( stream_id ); void *dict = vj_tag_get_dict( stream_id );
vj_font_set_constraints_and_dict( info->font, settings->min_frame_num, vj_font_set_constraints_and_dict( info->font, settings->min_frame_num,

1
veejay-1.0/veejay-server/veejay/vj-font.c
View File

@@ -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", veejay_msg(VEEJAY_MSG_DEBUG, "Subtitle: Dictionary %p, Lo = %ld , Hi = %ld, Fps = %f, font = %p",
dict, lo,hi, fps , font); dict, lo,hi, fps , font);
f->fps = fps; f->fps = fps;
if( f->dictionary ) if( f->dictionary )