Merge commit '1cf2f3d334f52849aae2be868bad1e5fa5f59aa0'
authorJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 16:04:30 +0000 (13:04 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 16:04:30 +0000 (13:04 -0300)
commit4c121ad5466a0ac8670f7e5253891554fc230e08
treeb39a9c8f23dccd87320582cf1bd1286b8f784de0
parent7c8bf2dc2ba02312e7bee8f7df7994c3d8587407
parent1cf2f3d334f52849aae2be868bad1e5fa5f59aa0
Merge commit '1cf2f3d334f52849aae2be868bad1e5fa5f59aa0'

* commit '1cf2f3d334f52849aae2be868bad1e5fa5f59aa0':
  h264_sei: drop an unnecessary h264dec.h include

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/h264_sei.c