Commit 69035f3e authored by Derek Buitenhuis's avatar Derek Buitenhuis Committed by Michael Niedermayer

Revert "libutvideodec: Make buf_size local"

This change was dependent on a different patch that
never actually made it into FFmpeg, and it actually
ended up breaking builds.

This reverts commit 70cf7bb9.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent dd7453a2
......@@ -43,6 +43,7 @@ typedef struct {
typedef struct {
CCodec *codec;
unsigned int buf_size;
uint8_t *output;
} UtVideoContext;
......@@ -52,7 +53,6 @@ static av_cold int utvideo_decode_init(AVCodecContext *avctx)
UtVideoExtra info;
int format;
int begin_ret;
unsigned int buf_size;
if (avctx->extradata_size != 4*4) {
av_log(avctx, AV_LOG_ERROR, "Extradata size mismatch.\n");
......@@ -90,8 +90,8 @@ static av_cold int utvideo_decode_init(AVCodecContext *avctx)
}
/* Only allocate the buffer once */
buf_size = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
utv->output = (uint8_t *)av_malloc(buf_size * sizeof(uint8_t));
utv->buf_size = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
utv->output = (uint8_t *)av_malloc(utv->buf_size * sizeof(uint8_t));
if (utv->output == NULL) {
av_log(avctx, AV_LOG_ERROR, "Unable to allocate output buffer.\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment