summaryrefslogtreecommitdiff
path: root/libavcodec/indeo2.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-07-26 14:58:44 +0000
committerPaul B Mahol <onemda@gmail.com>2013-07-31 20:01:42 +0000
commit451b2ca1b4349f9b60416cc057eaf5518d81025c (patch)
tree88301117fa2200ec03d1d08268a9ec196e889cba /libavcodec/indeo2.c
parent76e27b1d0594199b4b1ff8520312069f42373944 (diff)
downloadffmpeg-451b2ca1b4349f9b60416cc057eaf5518d81025c.tar.gz
indeo2: make code independent of sizeof(AVFrame)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/indeo2.c')
-rw-r--r--libavcodec/indeo2.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index f8e7415f82..79b844ed0e 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -34,7 +34,7 @@
typedef struct Ir2Context{
AVCodecContext *avctx;
- AVFrame picture;
+ AVFrame *picture;
GetBitContext gb;
int decode_delta;
} Ir2Context;
@@ -146,7 +146,7 @@ static int ir2_decode_frame(AVCodecContext *avctx,
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
AVFrame *picture = data;
- AVFrame * const p = &s->picture;
+ AVFrame * const p = s->picture;
int start, ret;
if ((ret = ff_reget_buffer(avctx, p)) < 0)
@@ -171,36 +171,36 @@ static int ir2_decode_frame(AVCodecContext *avctx,
if (s->decode_delta) { /* intraframe */
if ((ret = ir2_decode_plane(s, avctx->width, avctx->height,
- s->picture.data[0], s->picture.linesize[0],
+ s->picture->data[0], s->picture->linesize[0],
ir2_luma_table)) < 0)
return ret;
/* swapped U and V */
if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[2], s->picture.linesize[2],
+ s->picture->data[2], s->picture->linesize[2],
ir2_luma_table)) < 0)
return ret;
if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[1], s->picture.linesize[1],
+ s->picture->data[1], s->picture->linesize[1],
ir2_luma_table)) < 0)
return ret;
} else { /* interframe */
if ((ret = ir2_decode_plane_inter(s, avctx->width, avctx->height,
- s->picture.data[0], s->picture.linesize[0],
+ s->picture->data[0], s->picture->linesize[0],
ir2_luma_table)) < 0)
return ret;
/* swapped U and V */
if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[2], s->picture.linesize[2],
+ s->picture->data[2], s->picture->linesize[2],
ir2_luma_table)) < 0)
return ret;
if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[1], s->picture.linesize[1],
+ s->picture->data[1], s->picture->linesize[1],
ir2_luma_table)) < 0)
return ret;
}
- if ((ret = av_frame_ref(picture, &s->picture)) < 0)
+ if ((ret = av_frame_ref(picture, s->picture)) < 0)
return ret;
*got_frame = 1;
@@ -213,12 +213,13 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx)
Ir2Context * const ic = avctx->priv_data;
static VLC_TYPE vlc_tables[1 << CODE_VLC_BITS][2];
- avcodec_get_frame_defaults(&ic->picture);
ic->avctx = avctx;
avctx->pix_fmt= AV_PIX_FMT_YUV410P;
- avcodec_get_frame_defaults(&ic->picture);
+ ic->picture = av_frame_alloc();
+ if (!ic->picture)
+ return AVERROR(ENOMEM);
ir2_vlc.table = vlc_tables;
ir2_vlc.table_allocated = 1 << CODE_VLC_BITS;
@@ -238,9 +239,8 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx)
static av_cold int ir2_decode_end(AVCodecContext *avctx)
{
Ir2Context * const ic = avctx->priv_data;
- AVFrame *pic = &ic->picture;
- av_frame_unref(pic);
+ av_frame_free(&ic->picture);
return 0;
}