Merge commit '68f930d2188aba5b32624887dcbf688c23482834'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 13:13:20 +0000 (14:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 13:13:20 +0000 (14:13 +0100)
* commit '68f930d2188aba5b32624887dcbf688c23482834':
  h264: simplify calls to ff_er_add_slice().

Conflicts:
libavcodec/h264.c

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

@@@ -3865,17 -3765,16 +3863,17 @@@ static int decode_slice(struct AVCodecC
                      tprintf(s->avctx, "slice end %d %d\n",
                              get_bits_count(&s->gb), s->gb.size_in_bits);
  
 -                    if (get_bits_left(&s->gb) == 0) {
 +                    if (   get_bits_left(&s->gb) == 0
 +                        || get_bits_left(&s->gb) > 0 && !(s->avctx->err_recognition & AV_EF_AGGRESSIVE)) {
                          ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y,
                                          s->mb_x - 1, s->mb_y,
-                                         ER_MB_END & part_mask);
+                                         ER_MB_END);
  
                          return 0;
                      } else {
                          ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y,
 -                                        s->mb_x - 1, s->mb_y,
 +                                        s->mb_x, s->mb_y,
-                                         ER_MB_END & part_mask);
+                                         ER_MB_END);
  
                          return -1;
                      }