[SCM] libav/experimental: Merge declaration and initialization.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 11362767b80161603e4f366a8cefba78c5b8d102
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Apr 3 19:18:14 2008 +0000

    Merge declaration and initialization.
    
    Originally committed as revision 12676 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 033fcd5..4e654b0 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -131,9 +131,7 @@ void av_freep(void *arg)
 
 void *av_mallocz(unsigned int size)
 {
-    void *ptr;
-
-    ptr = av_malloc(size);
+    void *ptr = av_malloc(size);
     if (ptr)
         memset(ptr, 0, size);
     return ptr;

-- 
Libav/FFmpeg packaging