diff options
Diffstat (limited to 'libavcodec/qtrle.c')
| -rw-r--r-- | libavcodec/qtrle.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 1b92885..4a5437f 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -37,6 +37,7 @@ #include "avcodec.h" #include "bytestream.h" +#include "internal.h" typedef struct QtrleContext { AVCodecContext *avctx; @@ -412,10 +413,7 @@ static int qtrle_decode_frame(AVCodecContext *avctx, int ret; bytestream2_init(&s->g, avpkt->data, avpkt->size); - s->frame.reference = 3; - s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | - FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE; - if ((ret = avctx->reget_buffer(avctx, &s->frame)) < 0) { + if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0) { av_log (s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); return ret; } @@ -501,8 +499,9 @@ static int qtrle_decode_frame(AVCodecContext *avctx, } done: + if ((ret = av_frame_ref(data, &s->frame)) < 0) + return ret; *got_frame = 1; - *(AVFrame*)data = s->frame; /* always report that the buffer was completely consumed */ return avpkt->size; @@ -512,8 +511,7 @@ static av_cold int qtrle_decode_end(AVCodecContext *avctx) { QtrleContext *s = avctx->priv_data; - if (s->frame.data[0]) - avctx->release_buffer(avctx, &s->frame); + av_frame_unref(&s->frame); return 0; } |
