提交 93faa9fa 编写于 作者: V Vitor Sessak

More code factorization

Originally committed as revision 11900 to svn://svn.ffmpeg.org/ffmpeg/trunk
上级 37e0b997
...@@ -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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册