mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 13:22:53 +02:00
More code factorization
Originally committed as revision 11900 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
37e0b997a8
commit
93faa9fad7
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user