[FFmpeg-cvslog] flashsv: Drop unused function and struct parameters
Diego Biurrun
git at videolan.org
Wed Nov 21 18:16:00 CET 2012
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Oct 24 19:14:24 2012 +0200| [17fecb4a59926fc85d76efd0d0405f1aa84e429b] | committer: Diego Biurrun
flashsv: Drop unused function and struct parameters
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17fecb4a59926fc85d76efd0d0405f1aa84e429b
---
libavcodec/flashsv.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index a155bef..2ba3264 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -45,7 +45,6 @@
typedef struct BlockInfo {
uint8_t *pos;
int size;
- int unp_size;
} BlockInfo;
typedef struct FlashSVContext {
@@ -121,8 +120,7 @@ static av_cold int flashsv_decode_init(AVCodecContext *avctx)
}
-static int flashsv2_prime(FlashSVContext *s, uint8_t *src,
- int size, int unp_size)
+static int flashsv2_prime(FlashSVContext *s, uint8_t *src, int size)
{
z_stream zs;
int zret; // Zlib return code
@@ -173,8 +171,9 @@ static int flashsv_decode_block(AVCodecContext *avctx, AVPacket *avpkt,
return AVERROR_UNKNOWN;
}
if (s->zlibprime_curr || s->zlibprime_prev) {
- ret = flashsv2_prime(s, s->blocks[blk_idx].pos, s->blocks[blk_idx].size,
- s->blocks[blk_idx].unp_size);
+ ret = flashsv2_prime(s,
+ s->blocks[blk_idx].pos,
+ s->blocks[blk_idx].size);
if (ret < 0)
return ret;
}
@@ -196,7 +195,6 @@ static int flashsv_decode_block(AVCodecContext *avctx, AVPacket *avpkt,
if (s->is_keyframe) {
s->blocks[blk_idx].pos = s->keyframedata + (get_bits_count(gb) / 8);
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) {
/* Flash Screen Video stores the image upside down, so copy
More information about the ffmpeg-cvslog
mailing list