OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0c9cba2
)
vfwcap: actually use framerate option
author
Ramiro Polla
<ramiro.polla@gmail.com>
Fri, 2 Sep 2011 04:33:07 +0000
(
01:33
-0300)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 6 Sep 2011 19:12:45 +0000
(21:12 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/vfwcap.c
patch
|
blob
|
history
diff --git
a/libavdevice/vfwcap.c
b/libavdevice/vfwcap.c
index
6f42f9e
..
e5ecf84
100644
(file)
--- a/
libavdevice/vfwcap.c
+++ b/
libavdevice/vfwcap.c
@@
-314,6
+314,11
@@
static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
dump_bih(s, &bi->bmiHeader);
+ ret = av_parse_video_rate(&framerate_q, ctx->framerate);
+ if (ret < 0) {
+ av_log(s, AV_LOG_ERROR, "Could not parse framerate '%s'.\n", ctx->framerate);
+ goto fail;
+ }
if (ctx->video_size) {
ret = av_parse_video_size(&bi->bmiHeader.biWidth, &bi->bmiHeader.biHeight, ctx->video_size);