virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

indeo4: Consistently initialize variables

Browse Source 
Avoid using multiple variables for the same purpose.
This commit is contained in:
Vittorio Giovara
2016-03-19 18:07:21 -04:00
parent 6202e2fede
commit 64250d94b7
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/indeo4.c
View File

@@ -122,10 +122,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
if (ctx->frame_type == IVI4_FRAMETYPE_BIDIR) if (ctx->frame_type == IVI4_FRAMETYPE_BIDIR)
ctx->has_b_frames = 1; ctx->has_b_frames = 1;
ctx->transp_status = get_bits1(&ctx->gb); ctx->has_transp = get_bits1(&ctx->gb);
if (ctx->transp_status) {
ctx->has_transp = 1;
}
/* unknown bit: Mac decoder ignores this bit, XANIM returns error */ /* unknown bit: Mac decoder ignores this bit, XANIM returns error */
if (get_bits1(&ctx->gb)) { if (get_bits1(&ctx->gb)) {
@@ -159,10 +156,10 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
} }
/* Decode tile dimensions. */ /* Decode tile dimensions. */
if (get_bits1(&ctx->gb)) { ctx->uses_tiling = get_bits1(&ctx->gb);
if (ctx->uses_tiling) {
pic_conf.tile_height = scale_tile_size(pic_conf.pic_height, get_bits(&ctx->gb, 4)); pic_conf.tile_height = scale_tile_size(pic_conf.pic_height, get_bits(&ctx->gb, 4));
pic_conf.tile_width = scale_tile_size(pic_conf.pic_width, get_bits(&ctx->gb, 4)); pic_conf.tile_width = scale_tile_size(pic_conf.pic_width, get_bits(&ctx->gb, 4));
ctx->uses_tiling = 1;
} else { } else {
pic_conf.tile_height = pic_conf.pic_height; pic_conf.tile_height = pic_conf.pic_height;
pic_conf.tile_width = pic_conf.pic_width; pic_conf.tile_width = pic_conf.pic_width;

3
libavcodec/ivi.h
View File

@@ -218,7 +218,6 @@ typedef struct IVI45DecContext {
int prev_frame_type; ///< frame type of the previous frame int prev_frame_type; ///< frame type of the previous frame
uint32_t data_size; ///< size of the frame data in bytes from picture header uint32_t data_size; ///< size of the frame data in bytes from picture header
int is_scalable; int is_scalable;
int transp_status; ///< transparency mode status: 1 - enabled
const uint8_t *frame_data; ///< input frame data pointer const uint8_t *frame_data; ///< input frame data pointer
int inter_scal; ///< signals a sequence of scalable inter frames int inter_scal; ///< signals a sequence of scalable inter frames
uint32_t frame_size; ///< frame size in bytes uint32_t frame_size; ///< frame size in bytes
@@ -250,7 +249,7 @@ typedef struct IVI45DecContext {
int show_indeo4_info; int show_indeo4_info;
uint8_t has_b_frames; uint8_t has_b_frames;
uint8_t has_transp; uint8_t has_transp; ///< transparency mode status: 1 - enabled
uint8_t uses_tiling; uint8_t uses_tiling;
uint8_t uses_haar; uint8_t uses_haar;
uint8_t uses_fullpel; uint8_t uses_fullpel;