[FFmpeg-cvslog] lavfi/vf_alphamerge: fix unitialized pointers

Ganesh Ajjanagadde git at videolan.org
Thu Dec 10 14:02:51 CET 2015


ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde at gmail.com> | Thu Dec 10 07:57:41 2015 -0500| [bd3409f52a05088aee5f9068b7d0ab66191a66b5] | committer: Ganesh Ajjanagadde

lavfi/vf_alphamerge: fix unitialized pointers

Missed in commit 31f0d555e07797df1a0a141fa5e022648d480a49.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde at gmail.com>

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

 libavfilter/vf_alphamerge.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c
index ecc114c..a8a8d56 100644
--- a/libavfilter/vf_alphamerge.c
+++ b/libavfilter/vf_alphamerge.c
@@ -57,7 +57,7 @@ static int query_formats(AVFilterContext *ctx)
         AV_PIX_FMT_NONE
     };
     static const enum AVPixelFormat alpha_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE };
-    AVFilterFormats *main_formats, *alpha_formats;
+    AVFilterFormats *main_formats = NULL, *alpha_formats = NULL;
     int ret;
 
     if (!(main_formats = ff_make_format_list(main_fmts)) ||



More information about the ffmpeg-cvslog mailing list