generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-11-21 18:12:13 +01:00
commit ea5adf7080
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/flashsv.c
View File

@ -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 {
@ -122,8 +121,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
@ -175,8 +173,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;
} }
@ -198,7 +197,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