virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

a64multienc: use the AVFrame API properly.

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-09 10:14:46 +01:00
parent b9fb59d2ab
commit 13e9cc9ce0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/a64enc.h
View File

@ -34,9 +34,6 @@
#define C64YRES 200 #define C64YRES 200
typedef struct A64Context { typedef struct A64Context {
/* general variables */
AVFrame picture;
/* variables for multicolor modes */ /* variables for multicolor modes */
AVLFG randctx; AVLFG randctx;
int mc_lifetime; int mc_lifetime;

11
libavcodec/a64multienc.c
View File

@ -165,6 +165,7 @@ static void render_charset(AVCodecContext *avctx, uint8_t *charset,
static av_cold int a64multi_close_encoder(AVCodecContext *avctx) static av_cold int a64multi_close_encoder(AVCodecContext *avctx)
{ {
A64Context *c = avctx->priv_data; A64Context *c = avctx->priv_data;
av_frame_free(&avctx->coded_frame);
av_free(c->mc_meta_charset); av_free(c->mc_meta_charset);
av_free(c->mc_best_cb); av_free(c->mc_best_cb);
av_free(c->mc_charset); av_free(c->mc_charset);
@ -216,8 +217,12 @@ static av_cold int a64multi_init_encoder(AVCodecContext *avctx)
AV_WB32(avctx->extradata, c->mc_lifetime); AV_WB32(avctx->extradata, c->mc_lifetime);
AV_WB32(avctx->extradata + 16, INTERLACED); AV_WB32(avctx->extradata + 16, INTERLACED);
avcodec_get_frame_defaults(&c->picture); avctx->coded_frame = av_frame_alloc();
avctx->coded_frame = &c->picture; if (!avctx->coded_frame) {
a64multi_close_encoder(avctx);
return AVERROR(ENOMEM);
}
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
avctx->coded_frame->key_frame = 1; avctx->coded_frame->key_frame = 1;
if (!avctx->codec_tag) if (!avctx->codec_tag)
@ -247,7 +252,7 @@ static int a64multi_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet) const AVFrame *pict, int *got_packet)
{ {
A64Context *c = avctx->priv_data; A64Context *c = avctx->priv_data;
AVFrame *const p = &c->picture; AVFrame *const p = avctx->coded_frame;
int frame; int frame;
int x, y; int x, y;