[SCM] libav/experimental: Don't mix declarations and statements.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:52:18 UTC 2013


The following commit has been merged in the experimental branch:
commit 8c9d49f266b41895f2b500c196b97d089be271c4
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Oct 16 10:20:33 2006 +0000

    Don't mix declarations and statements.
    
    Originally committed as revision 6705 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/vhook/fish.c b/vhook/fish.c
index 7ab3448..a2dbd2f 100644
--- a/vhook/fish.c
+++ b/vhook/fish.c
@@ -338,6 +338,9 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
             }
 
             if (foundfile < ci->file_limit) {
+                FILE *f;
+                char fname[256];
+
                 size = avpicture_get_size(PIX_FMT_RGB24, width, height);
                 buf = av_malloc(size);
 
@@ -360,10 +363,6 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
                               picture1.data, picture1.linesize);
 
                     /* Write out the PPM file */
-
-                    FILE *f;
-                    char fname[256];
-
                     snprintf(fname, sizeof(fname), "%s/fishimg%ld_%"PRId64".ppm", ci->dir, (long)(av_gettime() / 1000000), pts);
                     f = fopen(fname, "w");
                     if (f) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list