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

use norm setting from dummy info instead of edl to open v4l2 device, dont zero norm setting

Browse Source
This commit is contained in:
niels
2015-06-18 21:41:53 +02:00
parent 231ea18dd7
commit a75bac7470
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
veejay-current/veejay-server/libstream/vj-tag.c
View File

@@ -429,7 +429,7 @@ int _vj_tag_new_unicap( vj_tag * tag, int stream_nr, int width, int height, int
_tag_info->effect_frame1->fps,_tag_info->edit_list->video_norm ); _tag_info->effect_frame1->fps,_tag_info->edit_list->video_norm );
} else { } else {
vj_tag_input->unicap[stream_nr] = v4l2_thread_new( refname, channel,palette,width,height, vj_tag_input->unicap[stream_nr] = v4l2_thread_new( refname, channel,palette,width,height,
_tag_info->effect_frame1->fps,_tag_info->edit_list->video_norm ); _tag_info->effect_frame1->fps,_tag_info->dummy->norm );
} }
if( !vj_tag_input->unicap[stream_nr] ) { if( !vj_tag_input->unicap[stream_nr] ) {
veejay_msg(0, "Unable to open device %d (%s)",device_num, refname ); veejay_msg(0, "Unable to open device %d (%s)",device_num, refname );

1
veejay-current/veejay-server/veejay/liblavplayvj.c
View File

@@ -3636,7 +3636,6 @@ static void configure_dummy_defaults(veejay_t *info, char override_norm, float f
if( info->dummy->fps <= 0.0f) if( info->dummy->fps <= 0.0f)
info->dummy->fps = dfps; info->dummy->fps = dfps;
info->dummy->norm = default_norm;
info->dummy->chroma = get_chroma_from_pixfmt( vj_to_pixfmt( info->pixel_format ) ); info->dummy->chroma = get_chroma_from_pixfmt( vj_to_pixfmt( info->pixel_format ) );
info->settings->output_fps = dfps; info->settings->output_fps = dfps;