Commit e2d09b65 authored by Michael Niedermayer's avatar Michael Niedermayer

set coded_frame

Originally committed as revision 13492 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent bf1310c7
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
#include "avcodec.h" #include "avcodec.h"
#include "rle.h" #include "rle.h"
typedef struct TargaContext {
AVFrame picture;
} TargaContext;
/** /**
* RLE compress the image, with maximum size of out_size * RLE compress the image, with maximum size of out_size
* @param outbuf Output buffer * @param outbuf Output buffer
...@@ -135,6 +139,12 @@ static int targa_encode_frame(AVCodecContext *avctx, ...@@ -135,6 +139,12 @@ static int targa_encode_frame(AVCodecContext *avctx,
static av_cold int targa_encode_init(AVCodecContext *avctx) static av_cold int targa_encode_init(AVCodecContext *avctx)
{ {
TargaContext *s = avctx->priv_data;
avcodec_get_frame_defaults(&s->picture);
s->picture.key_frame= 1;
avctx->coded_frame= &s->picture;
return 0; return 0;
} }
...@@ -142,7 +152,7 @@ AVCodec targa_encoder = { ...@@ -142,7 +152,7 @@ AVCodec targa_encoder = {
.name = "targa", .name = "targa",
.type = CODEC_TYPE_VIDEO, .type = CODEC_TYPE_VIDEO,
.id = CODEC_ID_TARGA, .id = CODEC_ID_TARGA,
.priv_data_size = 0, .priv_data_size = sizeof(TargaContext),
.init = targa_encode_init, .init = targa_encode_init,
.encode = targa_encode_frame, .encode = targa_encode_frame,
.pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_GRAY8, PIX_FMT_NONE}, .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_GRAY8, PIX_FMT_NONE},
......
...@@ -222,6 +222,7 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf, ...@@ -222,6 +222,7 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
*p = *pict; *p = *pict;
p->pict_type = FF_I_TYPE; p->pict_type = FF_I_TYPE;
p->key_frame = 1; p->key_frame = 1;
avctx->coded_frame= &s->picture;
s->compr = TIFF_PACKBITS; s->compr = TIFF_PACKBITS;
if (avctx->compression_level == 0) { if (avctx->compression_level == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment