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

avcodec: fix compilation without vdpau

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-17 15:49:59 +02:00
parent a0c6c8e53e
commit 6e4b9b8a2f
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

@ -25,10 +25,12 @@
#define AVCODEC_VDPAU_INTERNAL_H #define AVCODEC_VDPAU_INTERNAL_H
#include <stdint.h> #include <stdint.h>
#if CONFIG_VDPAU
#include <vdpau/vdpau.h> #include <vdpau/vdpau.h>
#include "vdpau.h"
#endif
#include "h264.h" #include "h264.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "vdpau.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)
@ -36,6 +38,7 @@ static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic)
return (uintptr_t)pic->f.data[3]; return (uintptr_t)pic->f.data[3];
} }
#if CONFIG_VDPAU
#if !FF_API_BUFS_VDPAU #if !FF_API_BUFS_VDPAU
union AVVDPAUPictureInfo { union AVVDPAUPictureInfo {
VdpPictureInfoH264 h264; VdpPictureInfoH264 h264;
@ -66,6 +69,7 @@ struct vdpau_picture_context {
*/ */
VdpBitstreamBuffer *bitstream_buffers; VdpBitstreamBuffer *bitstream_buffers;
}; };
#endif
int ff_vdpau_common_start_frame(Picture *pic, int ff_vdpau_common_start_frame(Picture *pic,
const uint8_t *buffer, uint32_t size); const uint8_t *buffer, uint32_t size);