[FFmpeg-cvslog] Merge commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 17 18:53:05 2016 +0100| [d9357332ae9a531075a50bc6ad24a166fe5a53ad] | committer: Derek Buitenhuis

Merge commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a'

* commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a':
  indeo4: Consistently initialize variables

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9357332ae9a531075a50bc6ad24a166fe5a53ad
---

 libavcodec/indeo4.c |    9 +++------
 libavcodec/ivi.h    |    3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index f91db9f..69f78c9 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -122,10 +122,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
     if (ctx->frame_type == IVI4_FRAMETYPE_BIDIR)
         ctx->has_b_frames = 1;
 
-    ctx->transp_status = get_bits1(&ctx->gb);
-    if (ctx->transp_status) {
-        ctx->has_transp = 1;
-    }
+    ctx->has_transp = get_bits1(&ctx->gb);
 
     /* unknown bit: Mac decoder ignores this bit, XANIM returns error */
     if (get_bits1(&ctx->gb)) {
@@ -159,10 +156,10 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
     }
 
     /* 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_width  = scale_tile_size(pic_conf.pic_width,  get_bits(&ctx->gb, 4));
-        ctx->uses_tiling = 1;
     } else {
         pic_conf.tile_height = pic_conf.pic_height;
         pic_conf.tile_width  = pic_conf.pic_width;
diff --git a/libavcodec/ivi.h b/libavcodec/ivi.h
index 6969d6e..3571808 100644
--- a/libavcodec/ivi.h
+++ b/libavcodec/ivi.h
@@ -219,7 +219,6 @@ typedef struct IVI45DecContext {
     int             prev_frame_type; ///< frame type of the previous frame
     uint32_t        data_size;       ///< size of the frame data in bytes from picture header
     int             is_scalable;
-    int             transp_status;   ///< transparency mode status: 1 - enabled
     const uint8_t   *frame_data;     ///< input frame data pointer
     int             inter_scal;      ///< signals a sequence of scalable inter frames
     uint32_t        frame_size;      ///< frame size in bytes
@@ -251,7 +250,7 @@ typedef struct IVI45DecContext {
 
     int             show_indeo4_info;
     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_haar;
     uint8_t         uses_fullpel;


======================================================================