From: Michael Niedermayer Date: Tue, 8 Mar 2016 17:44:34 +0000 (+0100) Subject: avutil/frame: Assert that width/height/channels is 0 for the destination of av_frame... X-Git-Tag: android-x86-7.1-r1~5024 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=13aae86a2b652360256f52ff292fb2fb0804cbc6;p=android-x86%2Fexternal-ffmpeg.git avutil/frame: Assert that width/height/channels is 0 for the destination of av_frame*_ref() This should detect caes where these functions are called in unclean destinations --- diff --git a/libavutil/frame.c b/libavutil/frame.c index 5607206a09..d5c7c9f32f 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_assert1(dst->width == 0 && dst->height == 0); + av_assert1(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_assert1(dst->width == 0 && dst->height == 0); + av_assert1(dst->channels == 0); + *dst = *src; if (src->extended_data == src->data) dst->extended_data = dst->data;