[FFmpeg-devel] [PATCH] avutil/frame: Assert that width/height/channels is 0 for the destination of av_frame*_ref()

Michael Niedermayer michael at niedermayer.cc
Tue Mar 8 21:14:58 CET 2016


This should detect caes where these functions are called in unclean destinations
---
 libavutil/frame.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavutil/frame.c b/libavutil/frame.c
index 5607206..dde32b0 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -375,6 +375,9 @@ int av_frame_ref(AVFrame *dst, const AVFrame *src)
 {
     int i, ret = 0;
 
+    av_assert0(dst->width == 0 && dst->height == 0);
+    av_assert0(dst->channels == 0);
+
     dst->format         = src->format;
     dst->width          = src->width;
     dst->height         = src->height;
@@ -504,6 +507,9 @@ void av_frame_unref(AVFrame *frame)
 
 void av_frame_move_ref(AVFrame *dst, AVFrame *src)
 {
+    av_assert0(dst->width == 0 && dst->height == 0);
+    av_assert0(dst->channels == 0);
+
     *dst = *src;
     if (src->extended_data == src->data)
         dst->extended_data = dst->data;
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list