diff options
Diffstat (limited to 'libavcodec/lagarith.c')
-rw-r--r-- | libavcodec/lagarith.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index eb8a77e..200cbdc 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -48,7 +48,6 @@ enum LagarithFrameType { typedef struct LagarithContext { AVCodecContext *avctx; - AVFrame picture; DSPContext dsp; int zeros; /**< number of consecutive zero bytes encountered */ int zeros_rem; /**< number of zero bytes remaining to output */ @@ -512,7 +511,8 @@ static int lag_decode_frame(AVCodecContext *avctx, const uint8_t *buf = avpkt->data; unsigned int buf_size = avpkt->size; LagarithContext *l = avctx->priv_data; - AVFrame *const p = &l->picture; + ThreadFrame frame = { .f = data }; + AVFrame *const p = data; uint8_t frametype = 0; uint32_t offset_gu = 0, offset_bv = 0, offset_ry = 9; uint32_t offs[4]; @@ -520,12 +520,6 @@ static int lag_decode_frame(AVCodecContext *avctx, int i, j, planes = 3; int ret; - AVFrame *picture = data; - - if (p->data[0]) - ff_thread_release_buffer(avctx, p); - - p->reference = 0; p->key_frame = 1; frametype = buf[0]; @@ -545,7 +539,7 @@ static int lag_decode_frame(AVCodecContext *avctx, planes = 4; } - if ((ret = ff_thread_get_buffer(avctx, p)) < 0) { + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -574,7 +568,7 @@ static int lag_decode_frame(AVCodecContext *avctx, if (frametype == FRAME_ARITH_RGB24 || frametype == FRAME_U_RGB24) avctx->pix_fmt = AV_PIX_FMT_RGB24; - if ((ret = ff_thread_get_buffer(avctx, p)) < 0) { + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -633,7 +627,7 @@ static int lag_decode_frame(AVCodecContext *avctx, case FRAME_ARITH_YUY2: avctx->pix_fmt = AV_PIX_FMT_YUV422P; - if ((ret = ff_thread_get_buffer(avctx, p)) < 0) { + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -659,7 +653,7 @@ static int lag_decode_frame(AVCodecContext *avctx, case FRAME_ARITH_YV12: avctx->pix_fmt = AV_PIX_FMT_YUV420P; - if ((ret = ff_thread_get_buffer(avctx, p)) < 0) { + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -691,7 +685,6 @@ static int lag_decode_frame(AVCodecContext *avctx, return AVERROR_PATCHWELCOME; } - *picture = *p; *got_frame = 1; return buf_size; @@ -711,8 +704,6 @@ static av_cold int lag_decode_end(AVCodecContext *avctx) { LagarithContext *l = avctx->priv_data; - if (l->picture.data[0]) - ff_thread_release_buffer(avctx, &l->picture); av_freep(&l->rgb_planes); return 0; |