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

pnm: do not set avctx->coded_frame

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-07-28 21:16:07 +00:00
parent 329221eee7
commit a5155294e5
4 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/pamenc.c
View File

@ -25,10 +25,9 @@
static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt, 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; PNMContext *s = avctx->priv_data;
AVFrame * const p = &s->picture;
int i, h, w, n, linesize, depth, maxval, ret; int i, h, w, n, linesize, depth, maxval, ret;
const char *tuple_type; const char *tuple_type;
uint8_t *ptr; 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) if ((ret = ff_alloc_packet2(avctx, pkt, n*h + 200)) < 0)
return ret; return ret;
*p = *pict;
p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1;
s->bytestream_start = s->bytestream_start =
s->bytestream = pkt->data; s->bytestream = pkt->data;
s->bytestream_end = pkt->data + pkt->size; s->bytestream_end = pkt->data + pkt->size;
@ -134,7 +129,6 @@ AVCodec ff_pam_encoder = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PAM, .id = AV_CODEC_ID_PAM,
.priv_data_size = sizeof(PNMContext), .priv_data_size = sizeof(PNMContext),
.init = ff_pnm_init,
.encode2 = pam_encode_frame, .encode2 = pam_encode_frame,
.pix_fmts = (const enum AVPixelFormat[]){ .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 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

10
libavcodec/pnm.c
View File

@ -196,13 +196,3 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
} }
return 0; 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;
}

2
libavcodec/pnm.h
View File

@ -28,12 +28,10 @@ typedef struct PNMContext {
uint8_t *bytestream; uint8_t *bytestream;
uint8_t *bytestream_start; uint8_t *bytestream_start;
uint8_t *bytestream_end; uint8_t *bytestream_end;
AVFrame picture;
int maxval; ///< maximum value of a pixel int maxval; ///< maximum value of a pixel
int type; int type;
} PNMContext; } PNMContext;
int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s); int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s);
int ff_pnm_init(AVCodecContext *avctx);
#endif /* AVCODEC_PNM_H */ #endif /* AVCODEC_PNM_H */

11
libavcodec/pnmenc.c
View File

@ -26,10 +26,9 @@
static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, 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; PNMContext *s = avctx->priv_data;
AVFrame * const p = &s->picture;
int i, h, h1, c, n, linesize, ret; int i, h, h1, c, n, linesize, ret;
uint8_t *ptr, *ptr1, *ptr2; uint8_t *ptr, *ptr1, *ptr2;
@ -38,10 +37,6 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
avctx->height) + 200)) < 0) avctx->height) + 200)) < 0)
return ret; return ret;
*p = *pict;
p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1;
s->bytestream_start = s->bytestream_start =
s->bytestream = pkt->data; s->bytestream = pkt->data;
s->bytestream_end = pkt->data + pkt->size; s->bytestream_end = pkt->data + pkt->size;
@ -132,7 +127,6 @@ AVCodec ff_pgm_encoder = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PGM, .id = AV_CODEC_ID_PGM,
.priv_data_size = sizeof(PNMContext), .priv_data_size = sizeof(PNMContext),
.init = ff_pnm_init,
.encode2 = pnm_encode_frame, .encode2 = pnm_encode_frame,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_NONE AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_NONE
@ -147,7 +141,6 @@ AVCodec ff_pgmyuv_encoder = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PGMYUV, .id = AV_CODEC_ID_PGMYUV,
.priv_data_size = sizeof(PNMContext), .priv_data_size = sizeof(PNMContext),
.init = ff_pnm_init,
.encode2 = pnm_encode_frame, .encode2 = pnm_encode_frame,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P16BE, AV_PIX_FMT_NONE AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P16BE, AV_PIX_FMT_NONE
@ -162,7 +155,6 @@ AVCodec ff_ppm_encoder = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PPM, .id = AV_CODEC_ID_PPM,
.priv_data_size = sizeof(PNMContext), .priv_data_size = sizeof(PNMContext),
.init = ff_pnm_init,
.encode2 = pnm_encode_frame, .encode2 = pnm_encode_frame,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_NONE AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_NONE
@ -177,7 +169,6 @@ AVCodec ff_pbm_encoder = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PBM, .id = AV_CODEC_ID_PBM,
.priv_data_size = sizeof(PNMContext), .priv_data_size = sizeof(PNMContext),
.init = ff_pnm_init,
.encode2 = pnm_encode_frame, .encode2 = pnm_encode_frame,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_MONOWHITE, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_MONOWHITE,
AV_PIX_FMT_NONE }, AV_PIX_FMT_NONE },