[FFmpeg-devel] [PATCH] Revert "libutvideodec: Make buf_size local"
Derek Buitenhuis
derek.buitenhuis at gmail.com
Thu Dec 1 23:20:19 CET 2011
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 70cf7bb958899c369f778e29b8bd4203723bed04.
---
libavcodec/libutvideo.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/libutvideo.cpp b/libavcodec/libutvideo.cpp
index 7126c36..635720e 100644
--- a/libavcodec/libutvideo.cpp
+++ b/libavcodec/libutvideo.cpp
@@ -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");
--
1.7.7.3
More information about the ffmpeg-devel
mailing list