Merge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Jun 2013 09:19:37 +0000 (11:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Jun 2013 09:37:09 +0000 (11:37 +0200)
* commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea':
  wmapro: make sure there is room to store the current packet

The check is replaced by an assert as it is impossible to occur
See: 780d45473c32fa356c8ce385c3ea4692567c3228

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/wmaprodec.c

@@@ -1469,6 -1459,14 +1469,8 @@@ static void save_bits(WMAProDecodeCtx *
          return;
      }
  
 -    if (len > put_bits_left(&s->pb)) {
 -        av_log(s->avctx, AV_LOG_ERROR,
 -               "Cannot append %d bits, only %d bits available.\n",
 -               len, put_bits_left(&s->pb));
 -        s->packet_loss = 1;
 -        return;
 -    }
++    av_assert0(len <= put_bits_left(&s->pb));
      s->num_saved_bits += len;
      if (!append) {
          avpriv_copy_bits(&s->pb, gb->buffer + (get_bits_count(gb) >> 3),