[FFmpeg-cvslog] lavfi/showwaves: fix check on showwaves->outpicref

Stefano Sabatini git at videolan.org
Tue Jan 22 20:36:10 CET 2013


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Tue Jan 22 12:18:52 2013 +0100| [5b10c5e7e4d79750974026f39940164d10b891cb] | committer: Stefano Sabatini

lavfi/showwaves: fix check on showwaves->outpicref

outpicref is not always in synch with showwaves->outpicref, which is
changed as a side effect of the call to functions.

Fix regression introduced in 5f634480d1c4ed7711a15d1be07e49177cf351c1,
+10l to me.

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

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

diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index 3e5f39f..20f127e 100644
--- a/libavfilter/avf_showwaves.c
+++ b/libavfilter/avf_showwaves.c
@@ -193,7 +193,7 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *insamples)
 
     /* draw data in the buffer */
     for (i = 0; i < nb_samples; i++) {
-        if (!outpicref) {
+        if (!showwaves->outpicref) {
             showwaves->outpicref = outpicref =
                 ff_get_video_buffer(outlink, AV_PERM_WRITE|AV_PERM_ALIGN,
                                     outlink->w, outlink->h);



More information about the ffmpeg-cvslog mailing list