avfilter/vf_shuffleframes: Assert that the case of an uninitialized ret does not...
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 1 Dec 2015 18:11:44 +0000 (19:11 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 1 Dec 2015 21:00:25 +0000 (22:00 +0100)
Fixes CID1258479

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavfilter/vf_shuffleframes.c

index 041429f..f49c9c6 100644 (file)
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
@@ -90,9 +91,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
         s->pts[s->in_frames] = frame->pts;
         s->in_frames++;
         ret = 0;
-    }
-
-    if (s->in_frames == s->nb_frames) {
+    } else if (s->in_frames == s->nb_frames) {
         int n, x;
 
         for (n = 0; n < s->nb_frames; n++) {
@@ -109,7 +108,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 
         for (n = 0; n < s->nb_frames; n++)
             av_frame_free(&s->frames[n]);
-    }
+    } else
+        av_assert0(0);
 
     return ret;
 }