[FFmpeg-cvslog] r11900 - trunk/libavfilter/formats.c
vitor
subversion
Sun Feb 10 19:04:56 CET 2008
Author: vitor
Date: Sun Feb 10 19:04:55 2008
New Revision: 11900
Log:
More code factorization
Modified:
trunk/libavfilter/formats.c
Modified: trunk/libavfilter/formats.c
==============================================================================
--- trunk/libavfilter/formats.c (original)
+++ trunk/libavfilter/formats.c Sun Feb 10 19:04:55 2008
@@ -25,10 +25,15 @@
static void merge_ref(AVFilterFormats *ret, AVFilterFormats *a)
{
int i;
+
for(i = 0; i < a->refcount; i ++) {
ret->refs[ret->refcount] = a->refs[i];
*ret->refs[ret->refcount++] = ret;
}
+
+ av_free(a->refs);
+ av_free(a->formats);
+ av_free(a);
}
AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
@@ -58,14 +63,6 @@ AVFilterFormats *avfilter_merge_formats(
merge_ref(ret, a);
merge_ref(ret, b);
- av_free(a->refs);
- av_free(a->formats);
- av_free(a);
-
- av_free(b->refs);
- av_free(b->formats);
- av_free(b);
-
return ret;
}
More information about the ffmpeg-cvslog
mailing list