Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068'

* commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068': h264: Discard currently unsupported registered sei Merged-by: Hendrik Leppkes <[email protected]>
zhengxj91 · Aug 24, 2015 · a4c13f9 · a4c13f9
2 parents 59cae19 + f9ab4fe
commit a4c13f9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
@@ -180,6 +180,12 @@ static int decode_registered_user_data_closed_caption(H264Context *h, int size)
  skip_bits(&h->gb, 8); // marker_bits
  }
  }
+ } else {
+ int i;
+ avpriv_request_sample(h->avctx, "Subtitles with data type 0x%02x",
+ user_data_type_code);
+ for (i = 0; i < size - 1; i++)
+ skip_bits(&h->gb, 8);
  }
 
  return 0;