diff options
| -rw-r--r-- | libavcodec/pamenc.c | 8 | ||||
| -rw-r--r-- | libavcodec/pnm.c | 10 | ||||
| -rw-r--r-- | libavcodec/pnm.h | 2 | ||||
| -rw-r--r-- | libavcodec/pnmenc.c | 11 |
4 files changed, 2 insertions, 29 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 diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 578fe34a6a..3fa4d7c95b 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -196,13 +196,3 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) } return 0; } - -av_cold int ff_pnm_init(AVCodecContext *avctx) -{ - PNMContext *s = avctx->priv_data; - - avcodec_get_frame_defaults(&s->picture); - avctx->coded_frame = &s->picture; - - return 0; -} diff --git a/libavcodec/pnm.h b/libavcodec/pnm.h index 92edf8dfef..5bc0aad29f 100644 --- a/libavcodec/pnm.h +++ b/libavcodec/pnm.h @@ -28,12 +28,10 @@ typedef struct PNMContext { uint8_t *bytestream; uint8_t *bytestream_start; uint8_t *bytestream_end; - AVFrame picture; int maxval; ///< maximum value of a pixel int type; } PNMContext; int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s); -int ff_pnm_init(AVCodecContext *avctx); #endif /* AVCODEC_PNM_H */ diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 8cd96bed5d..a3e1c78328 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -26,10 +26,9 @@ static int pnm_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, h1, c, n, linesize, ret; uint8_t *ptr, *ptr1, *ptr2; @@ -38,10 +37,6 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, avctx->height) + 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; @@ -132,7 +127,6 @@ AVCodec ff_pgm_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PGM, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_NONE @@ -147,7 +141,6 @@ AVCodec ff_pgmyuv_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PGMYUV, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P16BE, AV_PIX_FMT_NONE @@ -162,7 +155,6 @@ AVCodec ff_ppm_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PPM, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_NONE @@ -177,7 +169,6 @@ AVCodec ff_pbm_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PBM, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, |