Do not hardcode the type of AVFilterFormats.formats in allocation
authorVitor Sessak <vitor1001@gmail.com>
Sun, 10 Feb 2008 18:04:43 +0000 (18:04 +0000)
committerVitor Sessak <vitor1001@gmail.com>
Sun, 10 Feb 2008 18:04:43 +0000 (18:04 +0000)
Originally committed as revision 11897 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavfilter/formats.c

index ad1e793..bd8ce62 100644 (file)
@@ -29,8 +29,8 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
     ret = av_mallocz(sizeof(AVFilterFormats));
 
     /* merge list of formats */
     ret = av_mallocz(sizeof(AVFilterFormats));
 
     /* merge list of formats */
-    ret->formats = av_malloc(sizeof(int) * FFMIN(a->format_count,
-                                                 b->format_count));
+    ret->formats = av_malloc(sizeof(*ret->formats) * FFMIN(a->format_count,
+                                                           b->format_count));
     for(i = 0; i < a->format_count; i ++)
         for(j = 0; j < b->format_count; j ++)
             if(a->formats[i] == b->formats[j])
     for(i = 0; i < a->format_count; i ++)
         for(j = 0; j < b->format_count; j ++)
             if(a->formats[i] == b->formats[j])
@@ -72,7 +72,7 @@ AVFilterFormats *avfilter_make_format_list(int len, ...)
     va_list vl;
 
     ret = av_mallocz(sizeof(AVFilterFormats));
     va_list vl;
 
     ret = av_mallocz(sizeof(AVFilterFormats));
-    ret->formats = av_malloc(sizeof(int) * len);
+    ret->formats = av_malloc(sizeof(*ret->formats) * len);
     ret->format_count = len;
 
     va_start(vl, len);
     ret->format_count = len;
 
     va_start(vl, len);