aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-04-03 19:18:14 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-04-03 19:18:14 +0000
commit11362767b80161603e4f366a8cefba78c5b8d102 (patch)
tree88d00f3ca1fd9024b65cf5d58c83f999473b9a17
parent9b7ca3b71d3e5d4e2cd010b0f004cdad00e8d354 (diff)
downloadffmpeg-11362767b80161603e4f366a8cefba78c5b8d102.tar.gz
Merge declaration and initialization.
Originally committed as revision 12676 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavutil/mem.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c
index 033fcd5fe7..4e654b044c 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;