Merge commit '5aed1d4240d411533c102eec6944aa925b7f4964'

* commit '5aed1d4240d411533c102eec6944aa925b7f4964':
  vaapi: Fix -Wimplicit-function-declaration for ff_dlog() usage

See: 8f7b022c8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/vaapi_mpeg2.c

@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "internal.h"
 #include "mpegutils.h"
 #include "vaapi_internal.h"
+#include "internal.h"
 
 /** Reconstruct bitstream f_code */
 static inline int mpeg2_get_f_code(MpegEncContext *s)

libavcodec/vaapi_mpeg4.c

@@ -21,8 +21,8 @@
  */
 
 #include "vaapi_internal.h"
-#include "h263.h"
 #include "internal.h"
+#include "h263.h"
 #include "mpeg4video.h"
 
 /** Reconstruct bitstream intra_dc_vlc_thr */

libavcodec/vaapi_vc1.c

@@ -21,6 +21,7 @@
  */
 
 #include "vaapi_internal.h"
+#include "internal.h"
 #include "vc1.h"
 #include "vc1data.h"