Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-12-01 21:11:44 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-02 00:00:25 +0300
commit736e2e2c30088d0c2a428a51372c78a0bfb7f356 (patch)
tree909937a54cc20c524265d53a70a3b838e019bd5d /libavfilter/vf_shuffleframes.c
parentcde75e3150ff2f4d7b01df73a74cec83e42c365c (diff)
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.c8
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;
}