mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wcap-decode: Fix setting framerate

Browse Source 
Default to 30fps instead of crashing if we don't get a framerate on the
command line.
This commit is contained in:
Kristian Høgsberg
2012-05-29 10:51:55 -04:00
parent f4b5a4d12e
commit f40d5d893f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wcap/vpxenc.c
+8 -1
View File
@@ -315,6 +315,7 @@ struct input_state
int use_i420; int use_i420;
struct wcap_decoder *wcap; struct wcap_decoder *wcap;
uint32_t output_msecs; uint32_t output_msecs;
struct vpx_rational output_framerate;
}; };
static inline int rgb_to_yuv(uint32_t format, uint32_t p, int *u, int *v) static inline int rgb_to_yuv(uint32_t format, uint32_t p, int *u, int *v)
@@ -1811,8 +1812,14 @@ void open_input_file(struct input_state *input, struct global_config *global)
input->file_type = FILE_TYPE_WCAP; input->file_type = FILE_TYPE_WCAP;
input->w = input->wcap->width; input->w = input->wcap->width;
input->h = input->wcap->height; input->h = input->wcap->height;
input->framerate = global->framerate;
input->use_i420 = 0; input->use_i420 = 0;
if (global->have_framerate) {
input->framerate = global->framerate;
}
else {
input->framerate.num = 30;
input->framerate.den = 1;
}
} }
else else
{ {