[FFmpeg-cvslog] cmdutils: move grow_array out of #if CONFIG_AVFILTER
Janne Grunau
git at videolan.org
Sat Sep 24 01:28:20 CEST 2011
ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Wed Sep 21 14:20:20 2011 +0200| [e1b1015581afd5c65f4456c29cc0f059c52a5612] | committer: Janne Grunau
cmdutils: move grow_array out of #if CONFIG_AVFILTER
fixes programs linking with --disable-avfilter
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1b1015581afd5c65f4456c29cc0f059c52a5612
---
cmdutils.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmdutils.c b/cmdutils.c
index 16b64af..b6ed475 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 */
More information about the ffmpeg-cvslog
mailing list