From cdfa1c89b715aff78c39e68957f4e181e887cb01 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 5 May 2013 14:23:16 +0200 Subject: [PATCH] avcodec: Set frame.width/height on all exit pathes of ff_get_buffer() Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 8c99e55759..4136d9fda2 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -722,7 +722,7 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) * avcodec_default_get_buffer */ if (frame->buf[0]) - return 0; + goto end; priv = av_mallocz(sizeof(*priv)); if (!priv) { @@ -798,6 +798,7 @@ do { \ av_buffer_unref(&dummy_buf); +end: frame->width = avctx->width; frame->height = avctx->height;