diff options
Diffstat (limited to 'libavcodec/dpx.c')
-rw-r--r-- | libavcodec/dpx.c | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 310036b..bcd72d2 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -25,11 +25,6 @@ #include "avcodec.h" #include "internal.h" -typedef struct DPXContext { - AVFrame picture; -} DPXContext; - - static unsigned int read32(const uint8_t **ptr, int is_big) { unsigned int temp; @@ -64,9 +59,7 @@ static int decode_frame(AVCodecContext *avctx, { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; - DPXContext *const s = avctx->priv_data; - AVFrame *picture = data; - AVFrame *const p = &s->picture; + AVFrame *const p = data; uint8_t *ptr[AV_NUM_DATA_POINTERS]; unsigned int offset; @@ -186,9 +179,7 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } - if (s->picture.data[0]) - avctx->release_buffer(avctx, &s->picture); - if ((ret = ff_get_buffer(avctx, p)) < 0) { + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -262,36 +253,15 @@ static int decode_frame(AVCodecContext *avctx, break; } - *picture = s->picture; *got_frame = 1; return buf_size; } -static av_cold int decode_init(AVCodecContext *avctx) -{ - DPXContext *s = avctx->priv_data; - avcodec_get_frame_defaults(&s->picture); - avctx->coded_frame = &s->picture; - return 0; -} - -static av_cold int decode_end(AVCodecContext *avctx) -{ - DPXContext *s = avctx->priv_data; - if (s->picture.data[0]) - avctx->release_buffer(avctx, &s->picture); - - return 0; -} - AVCodec ff_dpx_decoder = { .name = "dpx", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DPX, - .priv_data_size = sizeof(DPXContext), - .init = decode_init, - .close = decode_end, .decode = decode_frame, .long_name = NULL_IF_CONFIG_SMALL("DPX image"), .capabilities = CODEC_CAP_DR1, |