Commit 1028e46f authored by vitor's avatar vitor

More code factorization


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11900 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 2ee4d1cd
...@@ -25,10 +25,15 @@ ...@@ -25,10 +25,15 @@
static void merge_ref(AVFilterFormats *ret, AVFilterFormats *a) static void merge_ref(AVFilterFormats *ret, AVFilterFormats *a)
{ {
int i; int i;
for(i = 0; i < a->refcount; i ++) { for(i = 0; i < a->refcount; i ++) {
ret->refs[ret->refcount] = a->refs[i]; ret->refs[ret->refcount] = a->refs[i];
*ret->refs[ret->refcount++] = ret; *ret->refs[ret->refcount++] = ret;
} }
av_free(a->refs);
av_free(a->formats);
av_free(a);
} }
AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b) AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
...@@ -58,14 +63,6 @@ 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, a);
merge_ref(ret, b); 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; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment