mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-07 08:30:10 +02:00
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>
This commit is contained in:
commit
e1459f4b0b
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user