Browse Source

Simplify, use avctx->frame_number.

Originally committed as revision 8309 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Benjamin Larsson 18 years ago
parent
commit
64472fcff1
1 changed files with 1 additions and 5 deletions
  1. +1
    -5
      libavcodec/flashsvenc.c

+ 1
- 5
libavcodec/flashsvenc.c View File

@@ -68,7 +68,6 @@ typedef struct FlashSVContext {
AVCodecContext *avctx; AVCodecContext *avctx;
uint8_t *previous_frame; uint8_t *previous_frame;
AVFrame frame; AVFrame frame;
int first_frame;
int image_width, image_height; int image_width, image_height;
int block_width, block_height; int block_width, block_height;
uint8_t* tmpblock; uint8_t* tmpblock;
@@ -113,8 +112,6 @@ static int flashsv_encode_init(AVCodecContext *avctx)
return -1; return -1;
} }


s->first_frame = 1;

// Needed if zlib unused or init aborted before deflateInit // Needed if zlib unused or init aborted before deflateInit
memset(&(s->zstream), 0, sizeof(z_stream)); memset(&(s->zstream), 0, sizeof(z_stream));
/* /*
@@ -241,14 +238,13 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_siz


*p = *pict; *p = *pict;


if (s->first_frame) {
if (avctx->frame_number == 0) {
s->previous_frame = av_mallocz(p->linesize[0]*s->image_height); s->previous_frame = av_mallocz(p->linesize[0]*s->image_height);
if (!s->previous_frame) { if (!s->previous_frame) {
av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n");
return -1; return -1;
} }
I_frame = 1; I_frame = 1;
s->first_frame = 0;
} }


#if 0 #if 0


Loading…
Cancel
Save