Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068'

* commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068':
  h264: Discard currently unsupported registered sei

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/h264_sei.c
index fbd582d07264bdc13cb85c07c1590384c10adcc5,361d4deb1adb55414f180b01ee9c4469d22a9798..fbb5576b9148710fa888e0759806aa780ce14dfe
--- 1/libavcodec/h264_sei.c
--- 2/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@@ -180,6 -169,12 +180,12 @@@ static int decode_registered_user_data_
                  skip_bits(&h->gb, 8);   // marker_bits
              }
          }
 -        avpriv_request_sample("Subtitles with data type 0x%02x",
+     } 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;