@@ -385,7 +385,6 @@ static int a64multi_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
c->next_pts = AV_NOPTS_VALUE;
av_assert0(pkt->size == req_size);
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = !!req_size;
}
return 0;
@@ -96,7 +96,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
/* Total length */
av_shrink_packet(pkt, buf - pkt->data);
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -299,7 +299,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
pkt->size = size * 4;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -87,7 +87,6 @@ static int avui_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -154,7 +154,6 @@ static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
ptr -= p->linesize[0]; // ... and go back
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -91,7 +91,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
flush_put_bits(&pb);
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -1308,7 +1308,6 @@ encode_coding_unit:
ff_side_data_set_encoder_stats(pkt, ctx->qscale * FF_QP2LAMBDA, NULL, 0, AV_PICTURE_TYPE_I);
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -271,7 +271,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
write32(buf + 16, size); /* file size */
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -1187,7 +1187,6 @@ static int dvvideo_encode_frame(AVCodecContext *c, AVPacket *pkt,
emms_c();
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -507,7 +507,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
av_shrink_packet(pkt, bytestream2_tell_p(pb));
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -105,7 +105,6 @@ static int fits_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
bytes_left = padded_data_size - data_size;
memset(bytestream, 0, bytes_left);
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -229,7 +229,6 @@ static int hap_encode(AVCodecContext *avctx, AVPacket *pkt,
hap_write_frame_header(ctx, pkt->data, final_data_size + header_length);
av_shrink_packet(pkt, final_data_size + header_length);
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -994,7 +994,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
s->picture_number++;
pkt->size = size * 4;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -1661,7 +1661,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
av_log(s->avctx, AV_LOG_DEBUG, "end\n");
pkt->size = s->buf - s->buf_start;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -415,7 +415,6 @@ static int encode_picture_ls(AVCodecContext *avctx, AVPacket *pkt,
emms_c();
- pkt->flags |= AV_PKT_FLAG_KEY;
av_shrink_packet(pkt, bytestream2_tell_p(&pb));
*got_packet = 1;
return 0;
@@ -103,7 +103,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
pkt->size = c->zstream.total_out;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -708,7 +708,6 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
av_shrink_packet(pkt, writer.pos);
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
ret = 0;
@@ -63,7 +63,6 @@ static int libwebp_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
goto end;
memcpy(pkt->data, mw.mem, mw.size);
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
end:
@@ -73,7 +73,6 @@ static int libwebp_anim_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return ret;
memcpy(pkt->data, assembled_data.bytes, assembled_data.size);
s->done = 1;
- pkt->flags |= AV_PKT_FLAG_KEY;
pkt->pts = pkt->dts = s->first_frame_pts;
*got_packet = 1;
return 0;
@@ -259,7 +259,6 @@ static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
flush_put_bits(&pb);
pkt->size = put_bits_ptr(&pb) - pb.buf;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -522,7 +522,6 @@ static int magy_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
bytestream2_seek_p(&pb, pos, SEEK_SET);
pkt->size = bytestream2_tell_p(&pb);
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
@@ -123,7 +123,6 @@ static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -187,7 +187,6 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
pkt->size = buf - pkt->data;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -142,7 +142,6 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
ptr2 += p->linesize[2];
}
}
- pkt->flags |= AV_PKT_FLAG_KEY;
av_shrink_packet(pkt, bytestream - bytestream_start);
*got_packet = 1;
@@ -795,7 +795,6 @@ static int prores_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
AV_WB32(pkt->data, compress_frame_size);/* update frame size */
- pkt->flags |= AV_PKT_FLAG_KEY;
pkt->size = compress_frame_size;
*got_packet = 1;
@@ -1136,7 +1136,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
bytestream_put_be32(&orig_buf, frame_size);
pkt->size = frame_size;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -81,7 +81,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
srcb_line += pic->linesize[1];
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -76,7 +76,6 @@ static int raw_encode(AVCodecContext *avctx, AVPacket *pkt,
AV_WB64(&pkt->data[8 * x], v << 48 | v >> 16);
}
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -250,7 +250,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
/* total length */
pkt->size = bytestream2_tell_p(&pbc);
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -189,7 +189,6 @@ static int sunrast_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
AV_WB32(&avpkt->data[16], s->length);
*got_packet_ptr = 1;
- avpkt->flags |= AV_PKT_FLAG_KEY;
avpkt->size = bytestream2_tell_p(&s->p);
return 0;
}
@@ -172,7 +172,6 @@ static int targa_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
memcpy(out, "\0\0\0\0\0\0\0\0TRUEVISION-XFILE.", 26);
pkt->size = out + 26 - pkt->data;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -515,7 +515,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
bytestream_put_le32(&ptr, 0);
pkt->size = ptr - pkt->data;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
fail:
@@ -616,11 +616,6 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
frame_info = c->frame_pred << 8;
bytestream2_put_le32(&pb, frame_info);
- /*
- * At least currently Ut Video is IDR only.
- * Set flags accordingly.
- */
- pkt->flags |= AV_PKT_FLAG_KEY;
pkt->size = bytestream2_tell_p(&pb);
/* Packet should be done */
@@ -147,7 +147,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
memcpy(buf, side_data->data, side_data->size);
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -65,7 +65,6 @@ static int v308_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
v += pic->linesize[2];
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -70,7 +70,6 @@ static int v408_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
a += pic->linesize[3];
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -69,7 +69,6 @@ static int v410_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
v += pic->linesize[2] >> 1;
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -71,7 +71,6 @@ static int xbm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
buf += snprintf(buf, 5, " };\n");
pkt->size = buf - pkt->data;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -206,7 +206,6 @@ static int xface_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
*(p++) = '\n';
*(p++) = 0;
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
@@ -211,7 +211,6 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
ptr += p->linesize[0];
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -72,7 +72,6 @@ static int y41p_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
@@ -55,7 +55,6 @@ static int yuv4_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
v += pic->linesize[2];
}
- pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
}
It is now set generically for all those encoders whose corresponding AVCodecDescriptor has the AV_CODEC_PROP_INTRA_ONLY. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/a64multienc.c | 1 - libavcodec/aliaspixenc.c | 1 - libavcodec/asvenc.c | 1 - libavcodec/avuienc.c | 1 - libavcodec/bmpenc.c | 1 - libavcodec/cljrenc.c | 1 - libavcodec/dnxhdenc.c | 1 - libavcodec/dpxenc.c | 1 - libavcodec/dvenc.c | 1 - libavcodec/exrenc.c | 1 - libavcodec/fitsenc.c | 1 - libavcodec/hapenc.c | 1 - libavcodec/huffyuvenc.c | 1 - libavcodec/j2kenc.c | 1 - libavcodec/jpeglsenc.c | 1 - libavcodec/lclenc.c | 1 - libavcodec/libopenjpegenc.c | 1 - libavcodec/libwebpenc.c | 1 - libavcodec/libwebpenc_animencoder.c | 1 - libavcodec/ljpegenc.c | 1 - libavcodec/magicyuvenc.c | 1 - libavcodec/pamenc.c | 1 - libavcodec/pcxenc.c | 1 - libavcodec/pnmenc.c | 1 - libavcodec/proresenc_anatoliy.c | 1 - libavcodec/proresenc_kostya.c | 1 - libavcodec/r210enc.c | 1 - libavcodec/rawenc.c | 1 - libavcodec/sgienc.c | 1 - libavcodec/sunrastenc.c | 1 - libavcodec/targaenc.c | 1 - libavcodec/tiffenc.c | 1 - libavcodec/utvideoenc.c | 5 ----- libavcodec/v210enc.c | 1 - libavcodec/v308enc.c | 1 - libavcodec/v408enc.c | 1 - libavcodec/v410enc.c | 1 - libavcodec/xbmenc.c | 1 - libavcodec/xfaceenc.c | 1 - libavcodec/xwdenc.c | 1 - libavcodec/y41penc.c | 1 - libavcodec/yuv4enc.c | 1 - 42 files changed, 46 deletions(-)