aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-25 03:11:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-25 13:37:40 +0200
commit015cc3239a20850a6de573afd1b9820107144942 (patch)
treeb25de497f1f8d9f713fc59903310a886514533ca
parent876e960d90778a58de51399da118b1486df1b4c7 (diff)
downloadffmpeg-015cc3239a20850a6de573afd1b9820107144942.tar.gz
lavfi/movie: free packet on decoder error
Prevents infinite loop, see Ticket2556 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/src_movie.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 058838aeac..a784f43b2b 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -514,6 +514,9 @@ static int movie_push_frame(AVFilterContext *ctx, unsigned out_id)
if (ret < 0) {
av_log(ctx, AV_LOG_WARNING, "Decode error: %s\n", av_err2str(ret));
av_frame_free(&movie->frame);
+ av_free_packet(&movie->pkt0);
+ movie->pkt0.size = 0;
+ movie->pkt0.data = NULL;
return 0;
}
if (!ret)