Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:46:30 +0000 (23:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:46:30 +0000 (23:46 +0100)
* commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb':
  h263dec: remove commented out cruft

Conflicts:
libavcodec/h263dec.c

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

@@@ -299,8 -290,7 +298,7 @@@ static int decode_slice(MpegEncContext 
      if (s->codec_id == AV_CODEC_ID_MPEG4         &&
          (s->workaround_bugs & FF_BUG_AUTODETECT) &&
          get_bits_left(&s->gb) >= 0               &&
 -        get_bits_left(&s->gb) < 48               &&
 +        get_bits_left(&s->gb) < 137              &&
-         // !s->resync_marker                     &&
          !s->data_partitioning) {
          const int bits_count = get_bits_count(&s->gb);
          const int bits_left  = s->gb.size_in_bits - bits_count;