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)
* commit '1cf2f3d334f52849aae2be868bad1e5fa5f59aa0':
  h264_sei: drop an unnecessary h264dec.h include

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

Simple merge