Merge commit 'a454dec1'

* commit 'a454dec1':
  pixdesc: fix NV20* descriptors
  h264_sei: check SEI size
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/h264_sei.c

@@ -285,7 +285,8 @@ int ff_h264_decode_sei(H264Context *h)
             av_log(h->avctx, AV_LOG_DEBUG, "SEI %d len:%d\n", type, size);
 
         if (size > get_bits_left(&h->gb) / 8) {
-            av_log(h->avctx, AV_LOG_ERROR, "SEI truncated\n");
+            av_log(h->avctx, AV_LOG_ERROR, "SEI type %d truncated at %d\n",
+                   type, get_bits_left(&h->gb));
             return AVERROR_INVALIDDATA;
         }
         next = get_bits_count(&h->gb) + 8 * size;