[FFmpeg-cvslog] lavfi: apply misc style fixes

Stefano Sabatini git at videolan.org
Thu Jun 2 18:55:15 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Thu Jun  2 16:26:55 2011 +0200| [77b32b73ed31f9aaa6c1e476c9a041399a35be9d] | committer: Stefano Sabatini

lavfi: apply misc style fixes

Adopt K&R style for overall consistency/readability.

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

 libavfilter/avfilter.c |   14 +++++++-------
 libavfilter/defaults.c |   22 +++++++++++-----------
 libavfilter/internal.h |    2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 72e0a87..b7ad6f0 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -77,8 +77,8 @@ static void store_in_pool(AVFilterBufferRef *ref)
 
     av_assert0(ref->buf->data[0]);
 
-    if(pool->count == POOL_SIZE){
-        AVFilterBufferRef *ref1= pool->pic[0];
+    if (pool->count == POOL_SIZE) {
+        AVFilterBufferRef *ref1 = pool->pic[0];
         av_freep(&ref1->video);
         av_freep(&ref1->audio);
         av_freep(&ref1->buf->data[0]);
@@ -89,9 +89,9 @@ static void store_in_pool(AVFilterBufferRef *ref)
         pool->pic[POOL_SIZE-1] = NULL;
     }
 
-    for(i=0; i<POOL_SIZE; i++){
-        if(!pool->pic[i]){
-            pool->pic[i]= ref;
+    for (i = 0; i < POOL_SIZE; i++) {
+        if (!pool->pic[i]) {
+            pool->pic[i] = ref;
             pool->count++;
             break;
         }
@@ -102,8 +102,8 @@ void avfilter_unref_buffer(AVFilterBufferRef *ref)
 {
     if (!ref)
         return;
-    if (!(--ref->buf->refcount)){
-        if(!ref->buf->free){
+    if (!(--ref->buf->refcount)) {
+        if (!ref->buf->free) {
             store_in_pool(ref);
             return;
         }
diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
index 9ee23e5..74ba599 100644
--- a/libavfilter/defaults.c
+++ b/libavfilter/defaults.c
@@ -40,28 +40,28 @@ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, int per
     uint8_t *data[4];
     int i;
     AVFilterBufferRef *picref = NULL;
-    AVFilterPool *pool= link->pool;
+    AVFilterPool *pool = link->pool;
 
-    if(pool) for(i=0; i<POOL_SIZE; i++){
-        picref= pool->pic[i];
-        if(picref && picref->buf->format == link->format && picref->buf->w == w && picref->buf->h == h){
-            AVFilterBuffer *pic= picref->buf;
-            pool->pic[i]= NULL;
+    if (pool) for (i = 0; i < POOL_SIZE; i++) {
+        picref = pool->pic[i];
+        if (picref && picref->buf->format == link->format && picref->buf->w == w && picref->buf->h == h) {
+            AVFilterBuffer *pic = picref->buf;
+            pool->pic[i] = NULL;
             pool->count--;
             picref->video->w = w;
             picref->video->h = h;
             picref->perms = perms | AV_PERM_READ;
-            picref->format= link->format;
+            picref->format = link->format;
             pic->refcount = 1;
             memcpy(picref->data,     pic->data,     sizeof(picref->data));
             memcpy(picref->linesize, pic->linesize, sizeof(picref->linesize));
             return picref;
         }
-    }else
+    } else
         pool = link->pool = av_mallocz(sizeof(AVFilterPool));
 
     // +2 is needed for swscaler, +16 to be SIMD-friendly
-    if ((i=av_image_alloc(data, linesize, w, h, link->format, 16)) < 0)
+    if ((i = av_image_alloc(data, linesize, w, h, link->format, 16)) < 0)
         return NULL;
 
     picref = avfilter_get_video_buffer_ref_from_arrays(data, linesize,
@@ -72,8 +72,8 @@ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, int per
     }
     memset(data[0], 128, i);
 
-    picref->buf->priv= pool;
-    picref->buf->free= NULL;
+    picref->buf->priv = pool;
+    picref->buf->free = NULL;
 
     return picref;
 }
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 333dcbf..be1e9b0 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -31,7 +31,7 @@
 typedef struct AVFilterPool {
     AVFilterBufferRef *pic[POOL_SIZE];
     int count;
-}AVFilterPool;
+} AVFilterPool;
 
 /**
  * Check for the validity of graph.



More information about the ffmpeg-cvslog mailing list