From d3abbb1d13638889ada1154905bbbdffb3935217 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 13 Jul 2012 01:09:43 +0000 Subject: [PATCH] lavc: fix ff_alloc_packet() Regression introduced in 740b9ff44. Signed-off-by: Paul B Mahol --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a326815bc4..5afa3e7e97 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1017,6 +1017,7 @@ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int size) return AVERROR(EINVAL); } + if (avctx) { av_assert0(!avpkt->data || avpkt->data != avctx->internal->byte_buffer); if (!avpkt->data || avpkt->size < size) { av_fast_padded_malloc(&avctx->internal->byte_buffer, &avctx->internal->byte_buffer_size, size); @@ -1024,6 +1025,7 @@ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int size) avpkt->size = avctx->internal->byte_buffer_size; avpkt->destruct = NULL; } + } if (avpkt->data) { void *destruct = avpkt->destruct;