Merge commit 'f0259a58'

* commit 'f0259a58':
  h264: check buffer size before accessing it

Conflicts:
	libavcodec/h264.c

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

libavcodec/h264.c

@@ -4755,7 +4755,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
                 h->workaround_bugs |= FF_BUG_TRUNCATED;
 
             if (!(h->workaround_bugs & FF_BUG_TRUNCATED))
-                while(dst_length > 0 && ptr[dst_length - 1] == 0)
+                while (dst_length > 0 && ptr[dst_length - 1] == 0)
                     dst_length--;
             bit_length = !dst_length ? 0
                                      : (8 * dst_length -