[FFmpeg-cvslog] lavfi: af_amerge options array was not ended with NULL

William Yu git at videolan.org
Fri Jun 15 11:23:11 CEST 2012


ffmpeg | branch: master | William Yu <genwillyu at gmail.com> | Fri Jun 15 15:46:13 2012 +0800| [f77a695d2e7c309823e69c6bf4078e5beaf61f13] | committer: Michael Niedermayer

lavfi: af_amerge options array was not ended with NULL

Add a NULL to prevent undefined behavior

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f77a695d2e7c309823e69c6bf4078e5beaf61f13
---

 libavfilter/af_amerge.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 95dd1ae..a8942a1 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -49,6 +49,7 @@ typedef struct {
 static const AVOption amerge_options[] = {
     { "inputs", "specify the number of inputs", OFFSET(nb_inputs),
       AV_OPT_TYPE_INT, { .dbl = 2 }, 2, SWR_CH_MAX },
+    {0}
 };
 
 static const AVClass amerge_class = {



More information about the ffmpeg-cvslog mailing list