Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: set ref_count to 0 for intra slices.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/h264.c
index be144f5,e7186c8..a3d6127
--- 1/libavcodec/h264.c
--- 2/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -3533,9 -3384,20 +3533,11 @@@ static int decode_slice_header(H264Cont
              h->list_count = 2;
          else
              h->list_count = 1;
-     } else
-         h->ref_count[1]= h->ref_count[0]= h->list_count= 0;
+     } else {
+         h->list_count = 0;
+         h->ref_count[0] = h->ref_count[1] = 0;
+     }
  
 -
 -    max_refs = h->picture_structure == PICT_FRAME ? 16 : 32;
 -
 -    if (h->ref_count[0] > max_refs || h->ref_count[1] > max_refs) {
 -        av_log(h->avctx, AV_LOG_ERROR, "reference overflow\n");
 -        h->ref_count[0] = h->ref_count[1] = 0;
 -        return AVERROR_INVALIDDATA;
 -    }
 -
      if (!default_ref_list_done)
          ff_h264_fill_default_ref_list(h);