OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc3e76f
)
cmdutils: move grow_array out of #if CONFIG_AVFILTER
author
Janne Grunau
<janne-libav@jannau.net>
Wed, 21 Sep 2011 12:20:20 +0000
(14:20 +0200)
committer
Janne Grunau
<janne-libav@jannau.net>
Fri, 23 Sep 2011 09:40:25 +0000
(11:40 +0200)
fixes programs linking with --disable-avfilter
cmdutils.c
patch
|
blob
|
history
diff --git
a/cmdutils.c
b/cmdutils.c
index
16b64af
..
b6ed475
100644
(file)
--- 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 */