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)
commita4c13f95fbe2e1c2a3e55bffcd55d5a679f45253
tree0b8d7899361de7e4e6e82d4a7b9c1bf7dae37d5c
parent59cae1916e30872448e6cafc85c5632ee42ebd1a
parentf9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068
Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/h264_sei.c