har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_shuffleframes: unbreak filter

Browse Source 
Regression since 736e2e2c30088d0c2a428a51372c78a0bfb7f356.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-09-08 10:53:43 +02:00
parent 8cfe60ef39
commit ae31ab8070
1 changed files with 10 additions and 5 deletions

15
libavfilter/vf_shuffleframes.c

@ -84,14 +84,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
ShuffleFramesContext *s = ctx->priv; ShuffleFramesContext *s = ctx->priv;
int ret; int ret = 0;
if (s->in_frames < s->nb_frames) { if (s->in_frames < s->nb_frames) {
s->frames[s->in_frames] = frame; s->frames[s->in_frames] = frame;
s->pts[s->in_frames] = frame->pts; s->pts[s->in_frames] = frame->pts;
s->in_frames++; s->in_frames++;
ret = 0; }
} else if (s->in_frames == s->nb_frames) {
if (s->in_frames == s->nb_frames) {
int n, x; int n, x;
for (n = 0; n < s->nb_frames; n++) { for (n = 0; n < s->nb_frames; n++) {
@ -108,8 +109,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
for (n = 0; n < s->nb_frames; n++) for (n = 0; n < s->nb_frames; n++)
av_frame_free(&s->frames[n]); av_frame_free(&s->frames[n]);
} else }
av_assert0(0);
return ret; return ret;
} }
@ -118,6 +118,11 @@ static av_cold void uninit(AVFilterContext *ctx)
{ {
ShuffleFramesContext *s = ctx->priv; ShuffleFramesContext *s = ctx->priv;
while (s->in_frames > 0) {
s->in_frames--;
av_frame_free(&s->frames[s->in_frames]);
}
av_freep(&s->frames); av_freep(&s->frames);
av_freep(&s->map); av_freep(&s->map);
av_freep(&s->pts); av_freep(&s->pts);