From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Fri, 3 Jun 2011 08:41:47 +0000 (+0200)
Subject: vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
X-Git-Tag: v0.8b1~2373
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4bda405447b13e84b4004ab281ae01abd230e22;p=platform%2Fupstream%2Flibav.git

vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()

The variable is used for containing the parsed value of framerate,
using a lexically consistent name eases readability/understanding.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
---

diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index 95dd4c3..80f9d00 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -249,7 +249,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
     DWORD biCompression;
     WORD biBitCount;
     int ret;
-    AVRational fps;
+    AVRational framerate_q;
 
     if (!strcmp(s->filename, "list")) {
         for (devnum = 0; devnum <= 9; devnum++) {
@@ -269,7 +269,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
 #if FF_API_FORMAT_PARAMETERS
     if (ap->time_base.num)
-        fps = (AVRational){ap->time_base.den, ap->time_base.num};
+        framerate_q = (AVRational){ap->time_base.den, ap->time_base.num};
 #endif
 
     ctx->hwnd = capCreateCaptureWindow(NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0);
@@ -369,7 +369,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     cparms.fYield = 1; // Spawn a background thread
     cparms.dwRequestMicroSecPerFrame =
-                               (fps.den*1000000) / fps.num;
+                               (framerate_q.den*1000000) / framerate_q.num;
     cparms.fAbortLeftMouse = 0;
     cparms.fAbortRightMouse = 0;
     cparms.fCaptureAudio = 0;
@@ -381,7 +381,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
         goto fail_io;
 
     codec = st->codec;
-    codec->time_base = (AVRational){fps.den, fps.num};
+    codec->time_base = (AVRational){framerate_q.den, framerate_q.num};
     codec->codec_type = AVMEDIA_TYPE_VIDEO;
     codec->width  = bi->bmiHeader.biWidth;
     codec->height = bi->bmiHeader.biHeight;