diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-05 10:32:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-05 11:14:29 +0100 |
| commit | e1459f4b0bb2482c40b458183f78feadb8fe417b (patch) | |
| tree | 7ad4420ff057438e5c754bb13a0cc2d0fb9fd39b | |
| parent | 934e489ee8f48cfe8ba18c57a9708b830b613c4d (diff) | |
| parent | 70cbf33405f50dfaf77e85f382a188acf17dc71a (diff) | |
| download | ffmpeg-e1459f4b0bb2482c40b458183f78feadb8fe417b.tar.gz | |
Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'
* 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>
| -rw-r--r-- | libavcodec/vdpau_internal.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index b6701f30db..32969963c7 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -28,10 +28,12 @@ #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) @@ -47,6 +49,8 @@ union AVVDPAUPictureInfo { VdpPictureInfoVC1 vc1; VdpPictureInfoMPEG4Part2 mpeg4; }; +#else +#include "vdpau.h" #endif struct vdpau_picture_context { |