diff options
Diffstat (limited to 'ffmpeg/libavcodec/avs.c')
| -rw-r--r-- | ffmpeg/libavcodec/avs.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/ffmpeg/libavcodec/avs.c b/ffmpeg/libavcodec/avs.c index e3733d7..c4eaf20 100644 --- a/ffmpeg/libavcodec/avs.c +++ b/ffmpeg/libavcodec/avs.c @@ -25,7 +25,7 @@ typedef struct { - AVFrame picture; + AVFrame *frame; } AvsContext; typedef enum { @@ -52,7 +52,7 @@ avs_decode_frame(AVCodecContext * avctx, int buf_size = avpkt->size; AvsContext *const avs = avctx->priv_data; AVFrame *picture = data; - AVFrame *const p = &avs->picture; + AVFrame *const p = avs->frame; const uint8_t *table, *vect; uint8_t *out; int i, j, x, y, stride, ret, vect_w = 3, vect_h = 3; @@ -65,8 +65,8 @@ avs_decode_frame(AVCodecContext * avctx, p->pict_type = AV_PICTURE_TYPE_P; p->key_frame = 0; - out = avs->picture.data[0]; - stride = avs->picture.linesize[0]; + out = p->data[0]; + stride = p->linesize[0]; if (buf_end - buf < 4) return AVERROR_INVALIDDATA; @@ -76,7 +76,7 @@ avs_decode_frame(AVCodecContext * avctx, if (type == AVS_PALETTE) { int first, last; - uint32_t *pal = (uint32_t *) avs->picture.data[1]; + uint32_t *pal = (uint32_t *) p->data[1]; first = AV_RL16(buf); last = first + AV_RL16(buf + 2); @@ -149,7 +149,7 @@ avs_decode_frame(AVCodecContext * avctx, align_get_bits(&change_map); } - if ((ret = av_frame_ref(picture, &avs->picture)) < 0) + if ((ret = av_frame_ref(picture, p)) < 0) return ret; *got_frame = 1; @@ -159,22 +159,28 @@ avs_decode_frame(AVCodecContext * avctx, static av_cold int avs_decode_init(AVCodecContext * avctx) { AvsContext *s = avctx->priv_data; + + s->frame = av_frame_alloc(); + if (!s->frame) + return AVERROR(ENOMEM); + avctx->pix_fmt = AV_PIX_FMT_PAL8; - avcodec_set_dimensions(avctx, 318, 198); - avcodec_get_frame_defaults(&s->picture); + ff_set_dimensions(avctx, 318, 198); + return 0; } static av_cold int avs_decode_end(AVCodecContext *avctx) { AvsContext *s = avctx->priv_data; - av_frame_unref(&s->picture); + av_frame_free(&s->frame); return 0; } AVCodec ff_avs_decoder = { .name = "avs", + .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVS, .priv_data_size = sizeof(AvsContext), @@ -182,5 +188,4 @@ AVCodec ff_avs_decoder = { .decode = avs_decode_frame, .close = avs_decode_end, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"), }; |