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

avcodec/flashsv2enc: drop dependancy on sizeof(AVFrame)

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-17 16:27:36 +01:00
parent 8443b27072
commit b8f4410ff6
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/flashsv2enc.c
View File

@@ -87,7 +87,6 @@ typedef struct FlashSV2Context {
AVCodecContext *avctx; AVCodecContext *avctx;
uint8_t *current_frame; uint8_t *current_frame;
uint8_t *key_frame; uint8_t *key_frame;
AVFrame frame;
uint8_t *encbuffer; uint8_t *encbuffer;
uint8_t *keybuffer; uint8_t *keybuffer;
uint8_t *databuffer; uint8_t *databuffer;
@@ -849,15 +848,12 @@ static int reconfigure_at_keyframe(FlashSV2Context * s, const uint8_t * image,
} }
static int flashsv2_encode_frame(AVCodecContext *avctx, AVPacket *pkt, static int flashsv2_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet) const AVFrame *p, int *got_packet)
{ {
FlashSV2Context *const s = avctx->priv_data; FlashSV2Context *const s = avctx->priv_data;
AVFrame *const p = &s->frame;
int res; int res;
int keyframe = 0; int keyframe = 0;
*p = *pict;
if ((res = ff_alloc_packet2(avctx, pkt, s->frame_size + FF_MIN_BUFFER_SIZE)) < 0) if ((res = ff_alloc_packet2(avctx, pkt, s->frame_size + FF_MIN_BUFFER_SIZE)) < 0)
return res; return res;
@@ -891,18 +887,11 @@ static int flashsv2_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if (keyframe) { if (keyframe) {
new_key_frame(s); new_key_frame(s);
p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1;
s->last_key_frame = avctx->frame_number; s->last_key_frame = avctx->frame_number;
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
av_log(avctx, AV_LOG_DEBUG, "Inserting key frame at frame %d\n", avctx->frame_number); av_log(avctx, AV_LOG_DEBUG, "Inserting key frame at frame %d\n", avctx->frame_number);
} else {
p->pict_type = AV_PICTURE_TYPE_P;
p->key_frame = 0;
} }
avctx->coded_frame = p;
pkt->size = res; pkt->size = res;
*got_packet = 1; *got_packet = 1;