Skip to content

F
ffmpeg
Commit 17fecb4a authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

flashsv: Drop unused function and struct parameters

parent 00dd9a6d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
libavcodec/flashsv.c
View file @ 17fecb4a
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
typedef struct BlockInfo { typedef struct BlockInfo {
uint8_t *pos; uint8_t *pos;
int size; int size;
int unp_size;
} BlockInfo; } BlockInfo;
typedef struct FlashSVContext { typedef struct FlashSVContext {
...@@ -121,8 +120,7 @@ static av_cold int flashsv_decode_init(AVCodecContext *avctx) ...@@ -121,8 +120,7 @@ static av_cold int flashsv_decode_init(AVCodecContext *avctx)
} }
static int flashsv2_prime(FlashSVContext *s, uint8_t *src, static int flashsv2_prime(FlashSVContext *s, uint8_t *src, int size)
int size, int unp_size)
{ {
z_stream zs; z_stream zs;
int zret; // Zlib return code int zret; // Zlib return code
...@@ -173,8 +171,9 @@ static int flashsv_decode_block(AVCodecContext *avctx, AVPacket *avpkt, ...@@ -173,8 +171,9 @@ static int flashsv_decode_block(AVCodecContext *avctx, AVPacket *avpkt,
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
} }
if (s->zlibprime_curr || s->zlibprime_prev) { if (s->zlibprime_curr || s->zlibprime_prev) {
ret = flashsv2_prime(s, s->blocks[blk_idx].pos, s->blocks[blk_idx].size, ret = flashsv2_prime(s,
s->blocks[blk_idx].unp_size); s->blocks[blk_idx].pos,
s->blocks[blk_idx].size);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
...@@ -196,7 +195,6 @@ static int flashsv_decode_block(AVCodecContext *avctx, AVPacket *avpkt, ...@@ -196,7 +195,6 @@ static int flashsv_decode_block(AVCodecContext *avctx, AVPacket *avpkt,
if (s->is_keyframe) { if (s->is_keyframe) {
s->blocks[blk_idx].pos = s->keyframedata + (get_bits_count(gb) / 8); s->blocks[blk_idx].pos = s->keyframedata + (get_bits_count(gb) / 8);
s->blocks[blk_idx].size = block_size; s->blocks[blk_idx].size = block_size;
s->blocks[blk_idx].unp_size = s->block_size * 3 - s->zstream.avail_out;
} }
if (!s->color_depth) { if (!s->color_depth) {
/* Flash Screen Video stores the image upside down, so copy /* Flash Screen Video stores the image upside down, so copy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment