Merge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 17:51:58 +0000 (18:51 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 17:51:58 +0000 (18:51 +0100)
* commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721':
  indeo4: Rework stream analysis report

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/indeo4.c
libavcodec/ivi.c
libavcodec/ivi.h

@@@ -330,14 -320,8 +322,12 @@@ static int decode_band_hdr(IVI45DecCont
                  return AVERROR_PATCHWELCOME;
              }
  
- #if IVI4_STREAM_ANALYSER
 +            if (transform_id < 10 && band->blk_size < 8) {
 +                av_log(avctx, AV_LOG_ERROR, "wrong transform size!\n");
 +                return AVERROR_INVALIDDATA;
 +            }
              if ((transform_id >= 0 && transform_id <= 2) || transform_id == 10)
                  ctx->uses_haar = 1;
- #endif
  
              band->inv_transform = transforms[transform_id].inv_trans;
              band->dc_transform  = transforms[transform_id].dc_trans;
Simple merge
Simple merge