virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'

Browse Source 
* 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:
Michael Niedermayer 2013-11-05 10:32:10 +01:00
commit e1459f4b0b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vdpau_internal.h
View File

@ -28,10 +28,12 @@
#include <stdint.h> #include <stdint.h>
#if CONFIG_VDPAU #if CONFIG_VDPAU
#include <vdpau/vdpau.h> #include <vdpau/vdpau.h>
#include "vdpau.h"
#endif #endif
#include "h264.h" #include "h264.h"
#include "avcodec.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "version.h"
/** Extract VdpVideoSurface from a Picture */ /** Extract VdpVideoSurface from a Picture */
static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic) static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic)
@ -47,6 +49,8 @@ union AVVDPAUPictureInfo {
VdpPictureInfoVC1 vc1; VdpPictureInfoVC1 vc1;
VdpPictureInfoMPEG4Part2 mpeg4; VdpPictureInfoMPEG4Part2 mpeg4;
}; };
#else
#include "vdpau.h"
#endif #endif
struct vdpau_picture_context { struct vdpau_picture_context {