From 93faa9fad75e3038b3ebf5664f524824230a401a Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Sun, 10 Feb 2008 18:04:55 +0000 Subject: More code factorization Originally committed as revision 11900 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/formats.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'libavfilter/formats.c') diff --git a/libavfilter/formats.c b/libavfilter/formats.c index d7d0322963..b3873d7acb 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -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(AVFilterFormats *a, AVFilterFormats *b) 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; } -- cgit v1.2.3