[FFmpeg-cvslog] lavfi/movie: free packet on decoder error

Michael Niedermayer git at videolan.org
Tue Jun 25 17:53:44 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 25 03:11:58 2013 +0200| [015cc3239a20850a6de573afd1b9820107144942] | committer: Michael Niedermayer

lavfi/movie: free packet on decoder error

Prevents infinite loop, see Ticket2556

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=015cc3239a20850a6de573afd1b9820107144942
---

 libavfilter/src_movie.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 058838a..a784f43 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)



More information about the ffmpeg-cvslog mailing list