diff options
Diffstat (limited to 'libavcodec/dvdec.c')
| -rw-r--r-- | libavcodec/dvdec.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index 64d2259..51e32b5 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -327,17 +327,12 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, return -1; /* NOTE: we only accept several full frames */ } - if (s->picture.data[0]) - avctx->release_buffer(avctx, &s->picture); - - avcodec_get_frame_defaults(&s->picture); - s->picture.reference = 0; s->picture.key_frame = 1; s->picture.pict_type = AV_PICTURE_TYPE_I; avctx->pix_fmt = s->sys->pix_fmt; avctx->time_base = s->sys->time_base; avcodec_set_dimensions(avctx, s->sys->width, s->sys->height); - if (ff_get_buffer(avctx, &s->picture) < 0) { + if (ff_get_buffer(avctx, &s->picture, 0) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } @@ -361,7 +356,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, /* return image */ *got_frame = 1; - *(AVFrame*)data = s->picture; + av_frame_move_ref(data, &s->picture); return s->sys->frame_size; } @@ -370,8 +365,7 @@ static int dvvideo_close(AVCodecContext *c) { DVVideoContext *s = c->priv_data; - if (s->picture.data[0]) - c->release_buffer(c, &s->picture); + av_frame_unref(&s->picture); return 0; } |
