diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-01 19:11:44 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-01 22:00:25 +0100 |
commit | 736e2e2c30088d0c2a428a51372c78a0bfb7f356 (patch) | |
tree | 909937a54cc20c524265d53a70a3b838e019bd5d /libavfilter/vf_shuffleframes.c | |
parent | cde75e3150ff2f4d7b01df73a74cec83e42c365c (diff) | |
download | ffmpeg-736e2e2c30088d0c2a428a51372c78a0bfb7f356.tar.gz |
avfilter/vf_shuffleframes: Assert that the case of an uninitialized ret does not occur
Fixes CID1258479
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_shuffleframes.c')
-rw-r--r-- | libavfilter/vf_shuffleframes.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_shuffleframes.c b/libavfilter/vf_shuffleframes.c index 041429f42f..f49c9c6049 100644 --- a/libavfilter/vf_shuffleframes.c +++ b/libavfilter/vf_shuffleframes.c @@ -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; } |