[FFmpeg-cvslog] Merge commit '1cf2f3d334f52849aae2be868bad1e5fa5f59aa0'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Aug  1 13:04:30 2016 -0300| [4c121ad5466a0ac8670f7e5253891554fc230e08] | committer: James Almer

Merge commit '1cf2f3d334f52849aae2be868bad1e5fa5f59aa0'

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

Merged-by: James Almer <jamrial at gmail.com>

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

 libavcodec/h264_sei.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 6332af5..5053962 100644
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -28,7 +28,7 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "golomb.h"
-#include "h264dec.h"
+#include "h264_ps.h"
 #include "h264_sei.h"
 #include "internal.h"
 


======================================================================