summaryrefslogtreecommitdiff
path: root/libavcodec/pamenc.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-07-28 21:16:07 +0000
committerPaul B Mahol <onemda@gmail.com>2013-07-28 22:27:36 +0000
commita5155294e571bf1861627c7e9c3f4c32c5df32dc (patch)
tree1ee96fc5eca32651cdb8fe5a6dba1ccae1bd1cf6 /libavcodec/pamenc.c
parent329221eee7d643c9b417043dadba856a313c9817 (diff)
downloadffmpeg-a5155294e571bf1861627c7e9c3f4c32c5df32dc.tar.gz
pnm: do not set avctx->coded_frame
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/pamenc.c')
-rw-r--r--libavcodec/pamenc.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c
index 3e47278469..2c4c9e0927 100644
--- a/libavcodec/pamenc.c
+++ b/libavcodec/pamenc.c
@@ -25,10 +25,9 @@
static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
- const AVFrame *pict, int *got_packet)
+ const AVFrame *p, int *got_packet)
{
PNMContext *s = avctx->priv_data;
- AVFrame * const p = &s->picture;
int i, h, w, n, linesize, depth, maxval, ret;
const char *tuple_type;
uint8_t *ptr;
@@ -91,10 +90,6 @@ static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if ((ret = ff_alloc_packet2(avctx, pkt, n*h + 200)) < 0)
return ret;
- *p = *pict;
- p->pict_type = AV_PICTURE_TYPE_I;
- p->key_frame = 1;
-
s->bytestream_start =
s->bytestream = pkt->data;
s->bytestream_end = pkt->data + pkt->size;
@@ -134,7 +129,6 @@ AVCodec ff_pam_encoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PAM,
.priv_data_size = sizeof(PNMContext),
- .init = ff_pnm_init,
.encode2 = pam_encode_frame,
.pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_RGBA64BE, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE