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/v210x.c | |
parent | 6e7b50b4270116ded8b874d76cb7c5b1a0341827 (diff) | |
download | ffmpeg-759001c534287a96dc96d1e274665feb7059145d.tar.gz |
lavc decoders: work with refcounted frames.
Diffstat (limited to 'libavcodec/v210x.c')
-rw-r--r-- | libavcodec/v210x.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c index 97938b1090..758294c5bb 100644 --- a/libavcodec/v210x.c +++ b/libavcodec/v210x.c @@ -33,8 +33,6 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV422P16; avctx->bits_per_raw_sample = 10; - avctx->coded_frame= avcodec_alloc_frame(); - return 0; } @@ -42,15 +40,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { const uint32_t *src = (const uint32_t *)avpkt->data; - AVFrame *pic = avctx->coded_frame; + AVFrame *pic = data; int width = avctx->width; int y = 0; uint16_t *ydst, *udst, *vdst, *yend; int ret; - if (pic->data[0]) - avctx->release_buffer(avctx, pic); - if (avpkt->size < avctx->width * avctx->height * 8 / 3) { av_log(avctx, AV_LOG_ERROR, "Packet too small\n"); return AVERROR_INVALIDDATA; @@ -60,8 +55,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, av_log_ask_for_sample(avctx, "Probably padded data\n"); } - pic->reference = 0; - if ((ret = ff_get_buffer(avctx, pic)) < 0) + if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) return ret; ydst = (uint16_t *)pic->data[0]; @@ -122,27 +116,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } *got_frame = 1; - *(AVFrame*)data= *avctx->coded_frame; return avpkt->size; } -static av_cold int decode_close(AVCodecContext *avctx) -{ - AVFrame *pic = avctx->coded_frame; - if (pic->data[0]) - avctx->release_buffer(avctx, pic); - av_freep(&avctx->coded_frame); - - return 0; -} - AVCodec ff_v210x_decoder = { .name = "v210x", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_V210X, .init = decode_init, - .close = decode_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), |