[FFmpeg-cvslog] ffmpeg: Clear fifo pointer on deallocation
Michael Niedermayer
git at videolan.org
Tue Apr 18 05:06:53 EEST 2017
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Apr 18 02:12:05 2017 +0200| [d0b3922d24724cf31bcb1e979dbfb748b3cdd382] | committer: Michael Niedermayer
ffmpeg: Clear fifo pointer on deallocation
Not leaving stale pointers is more robust
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0b3922d24724cf31bcb1e979dbfb748b3cdd382
---
ffmpeg.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index e4b94b2fa0..143322c321 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -482,7 +482,7 @@ static void ffmpeg_cleanup(int ret)
sizeof(frame), NULL);
av_frame_free(&frame);
}
- av_fifo_free(fg->inputs[j]->frame_queue);
+ av_fifo_freep(&fg->inputs[j]->frame_queue);
if (fg->inputs[j]->ist->sub2video.sub_queue) {
while (av_fifo_size(fg->inputs[j]->ist->sub2video.sub_queue)) {
AVSubtitle sub;
@@ -490,7 +490,7 @@ static void ffmpeg_cleanup(int ret)
&sub, sizeof(sub), NULL);
avsubtitle_free(&sub);
}
- av_fifo_free(fg->inputs[j]->ist->sub2video.sub_queue);
+ av_fifo_freep(&fg->inputs[j]->ist->sub2video.sub_queue);
}
av_buffer_unref(&fg->inputs[j]->hw_frames_ctx);
av_freep(&fg->inputs[j]->name);
More information about the ffmpeg-cvslog
mailing list