Merge commit 'b24dafe1'

* commit 'b24dafe1':
  lavc: drop unnecessary h264dec.h includes
Merged-by: James Almer <jamrial@gmail.com>

libavcodec/h264_parser.c

@@ -36,10 +36,10 @@
 #include "libavutil/mem.h"
 #include "libavutil/pixfmt.h"
 
+#include "avcodec.h"
 #include "get_bits.h"
 #include "golomb.h"
 #include "h264.h"
-#include "h264dec.h"
 #include "h264_sei.h"
 #include "h264_ps.h"
 #include "h264data.h"

libavcodec/qsvenc_h264.c

@@ -26,11 +26,11 @@
 
 #include <mfx/mfxvideo.h>
 
+#include "libavutil/common.h"
 #include "libavutil/opt.h"
 
 #include "avcodec.h"
 #include "internal.h"
-#include "h264dec.h"
 #include "qsv.h"
 #include "qsv_internal.h"
 #include "qsvenc.h"