* commit '
70cbf33405f50dfaf77e85f382a188acf17dc71a':
vdpau: Add missing #includes to fix standalone header compilation
Conflicts:
libavcodec/vdpau_internal.h
Not completely merged as this would break use of vdpau.h from C++
Merged-by: Michael Niedermayer <michaelni@gmx.at>
#ifndef AVCODEC_VDPAU_INTERNAL_H
#define AVCODEC_VDPAU_INTERNAL_H
+#include "config.h"
#include <stdint.h>
+#if CONFIG_VDPAU
#include <vdpau/vdpau.h>
- #include "vdpau.h"
+#endif
+#include "h264.h"
+
+ #include "avcodec.h"
#include "mpegvideo.h"
+ #include "version.h"
/** Extract VdpVideoSurface from a Picture */
static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic)