diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-21 18:12:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-21 18:12:13 +0100 |
| commit | ea5adf7080403ad70a3827830c26319823f49adc (patch) | |
| tree | d36bd774e5da69f9a5ebe51c84282e3c5b4d7cb8 /libavcodec | |
| parent | b044e81f069cc97488868c3f2ef393c193644f0c (diff) | |
| parent | 17fecb4a59926fc85d76efd0d0405f1aa84e429b (diff) | |
| download | ffmpeg-ea5adf7080403ad70a3827830c26319823f49adc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flashsv: Drop unused function and struct parameters
pcm: fix decoding of pcm_s16le_planar on big-endian
Conflicts:
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/flashsv.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 9e13ea6251..46a103b22c 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 { @@ -122,8 +121,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 @@ -175,8 +173,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; } @@ -198,7 +197,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 |