diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-11-21 21:34:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-08 07:38:30 +0100 |
| commit | 759001c534287a96dc96d1e274665feb7059145d (patch) | |
| tree | 6ace9560c20aa30db92067c5b45d7bd86e458d10 /libavcodec/bethsoftvideo.c | |
| parent | 6e7b50b4270116ded8b874d76cb7c5b1a0341827 (diff) | |
lavc decoders: work with refcounted frames.
Diffstat (limited to 'libavcodec/bethsoftvideo.c')
| -rw-r--r-- | libavcodec/bethsoftvideo.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index d0b34fdbe4..73145701ff 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -31,6 +31,7 @@ #include "avcodec.h" #include "bethsoftvideo.h" #include "bytestream.h" +#include "internal.h" typedef struct BethsoftvidContext { AVFrame frame; @@ -40,9 +41,6 @@ typedef struct BethsoftvidContext { static av_cold int bethsoftvid_decode_init(AVCodecContext *avctx) { BethsoftvidContext *vid = avctx->priv_data; - vid->frame.reference = 1; - vid->frame.buffer_hints = FF_BUFFER_HINTS_VALID | - FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; avctx->pix_fmt = AV_PIX_FMT_PAL8; return 0; } @@ -75,7 +73,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, int code, ret; int yoffset; - if ((ret = avctx->reget_buffer(avctx, &vid->frame)) < 0) { + if ((ret = ff_reget_buffer(avctx, &vid->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); return ret; } @@ -136,8 +134,10 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, } end: + if ((ret = av_frame_ref(data, &vid->frame)) < 0) + return ret; + *got_frame = 1; - *(AVFrame*)data = vid->frame; return avpkt->size; } @@ -145,8 +145,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx) { BethsoftvidContext * vid = avctx->priv_data; - if(vid->frame.data[0]) - avctx->release_buffer(avctx, &vid->frame); + av_frame_unref(&vid->frame); return 0; } |