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 (file)
--- 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;