[FFmpeg-cvslog] vfwcap: actually use framerate option

Ramiro Polla git at videolan.org
Tue Sep 6 21:21:21 CEST 2011


ffmpeg | branch: master | Ramiro Polla <ramiro.polla at gmail.com> | Fri Sep  2 01:33:07 2011 -0300| [0a333001a216d79b1b74f6620d66be188162f872] | committer: Michael Niedermayer

vfwcap: actually use framerate option

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a333001a216d79b1b74f6620d66be188162f872
---

 libavdevice/vfwcap.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index 6f42f9e..e5ecf84 100644
--- 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);



More information about the ffmpeg-cvslog mailing list