aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2011-09-21 14:20:20 +0200
committerJanne Grunau <janne-libav@jannau.net>2011-09-23 11:40:25 +0200
commite1b1015581afd5c65f4456c29cc0f059c52a5612 (patch)
tree7b521cc7469beedaa59a0fe97260959eb5ddcfee
parentdc3e76f3f22b0ea62cad7093e34eab4e8f889b09 (diff)
downloadffmpeg-e1b1015581afd5c65f4456c29cc0f059c52a5612.tar.gz
cmdutils: move grow_array out of #if CONFIG_AVFILTER
fixes programs linking with --disable-avfilter
-rw-r--r--cmdutils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c
index 16b64aff23..b6ed475fba 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -989,6 +989,8 @@ int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame,
return 1;
}
+#endif /* CONFIG_AVFILTER */
+
void *grow_array(void *array, int elem_size, int *size, int new_size)
{
if (new_size >= INT_MAX / elem_size) {
@@ -1007,5 +1009,3 @@ void *grow_array(void *array, int elem_size, int *size, int new_size)
}
return array;
}
-
-#endif /* CONFIG_AVFILTER */