Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'

* commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f':
  vdpau: Adjust necessary #includes for vdpau_internal.h

Conflicts:
	libavcodec/vdpau_internal.h

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

libavcodec/vdpau_internal.h

@@ -31,10 +31,10 @@
 #endif
 #include "h264.h"
 
+#include "libavutil/frame.h"
+
 #include "avcodec.h"
 #include "mpeg4video.h"
-#include "mpegvideo.h"
-#include "version.h"
 
 /** Extract VdpVideoSurface from an AVFrame */
 static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic)

libavcodec/vdpau_mpeg12.c

@@ -24,6 +24,7 @@
 #include <vdpau/vdpau.h>
 
 #include "avcodec.h"
+#include "mpegvideo.h"
 #include "vdpau.h"
 #include "vdpau_internal.h"