[FFmpeg-cvslog] avf_showwaves: fix null pointer dereference

Michael Niedermayer git at videolan.org
Mon Jan 21 23:25:52 CET 2013


ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 23:00:20 2013 +0100| [78526c279fddc9f497e65ef937783e7c8519102e] | committer: Michael Niedermayer

avf_showwaves: fix null pointer dereference

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e4eebc2da9da886e1bdf87d29e9a4c5b55111036)

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

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

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

diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index dcbe8b8..81ee74d 100644
--- a/libavfilter/avf_showwaves.c
+++ b/libavfilter/avf_showwaves.c
@@ -220,6 +220,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples)
         }
         if (showwaves->buf_idx == showwaves->w)
             push_frame(outlink);
+        outpicref = showwaves->outpicref;
     }
 
     avfilter_unref_buffer(insamples);



More information about the ffmpeg-cvslog mailing list