virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

zerocodec: use the AVFrame API properly.

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-09 10:14:46 +01:00
parent a837c4f2df
commit 6886a85f5c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/zerocodec.c
View File

@ -23,7 +23,7 @@
#include "libavutil/common.h" #include "libavutil/common.h"
typedef struct { typedef struct {
AVFrame previous_frame; AVFrame *previous_frame;
z_stream zstream; z_stream zstream;
} ZeroCodecContext; } ZeroCodecContext;
@ -32,7 +32,7 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
{ {
ZeroCodecContext *zc = avctx->priv_data; ZeroCodecContext *zc = avctx->priv_data;
AVFrame *pic = data; AVFrame *pic = data;
AVFrame *prev_pic = &zc->previous_frame; AVFrame *prev_pic = zc->previous_frame;
z_stream *zstream = &zc->zstream; z_stream *zstream = &zc->zstream;
uint8_t *prev = prev_pic->data[0]; uint8_t *prev = prev_pic->data[0];
uint8_t *dst; uint8_t *dst;
@ -93,8 +93,8 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
dst -= pic->linesize[0]; dst -= pic->linesize[0];
} }
av_frame_unref(&zc->previous_frame); av_frame_unref(zc->previous_frame);
if ((ret = av_frame_ref(&zc->previous_frame, pic)) < 0) if ((ret = av_frame_ref(zc->previous_frame, pic)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;
@ -106,7 +106,7 @@ static av_cold int zerocodec_decode_close(AVCodecContext *avctx)
{ {
ZeroCodecContext *zc = avctx->priv_data; ZeroCodecContext *zc = avctx->priv_data;
av_frame_unref(&zc->previous_frame); av_frame_free(&zc->previous_frame);
inflateEnd(&zc->zstream); inflateEnd(&zc->zstream);
@ -132,6 +132,12 @@ static av_cold int zerocodec_decode_init(AVCodecContext *avctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
zc->previous_frame = av_frame_alloc();
if (!zc->previous_frame) {
zerocodec_decode_close(avctx);
return AVERROR(ENOMEM);
}
return 0; return 0;
} }