Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:36:07 +0000 (10:36 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:36:07 +0000 (10:36 +0200)
* commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068':
  h264: Discard currently unsupported registered sei

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
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;