[FFmpeg-cvslog] Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Aug 24 10:36:07 2015 +0200| [a4c13f95fbe2e1c2a3e55bffcd55d5a679f45253] | committer: Hendrik Leppkes

Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4c13f95fbe2e1c2a3e55bffcd55d5a679f45253
---