mirror of https://git.ffmpeg.org/ffmpeg.git
vdpau: Rename union, avoid name conflict with vdpau
Fixes Ticket2203 Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
ccf9dd00da
commit
68dfe530e0
|
@ -52,7 +52,7 @@
|
|||
#include <vdpau/vdpau.h>
|
||||
#include <vdpau/vdpau_x11.h>
|
||||
|
||||
union VdpPictureInfo {
|
||||
union FFVdpPictureInfo {
|
||||
VdpPictureInfoH264 h264;
|
||||
VdpPictureInfoMPEG1Or2 mpeg;
|
||||
VdpPictureInfoVC1 vc1;
|
||||
|
@ -88,7 +88,7 @@ typedef struct AVVDPAUContext {
|
|||
*
|
||||
* Set by libavcodec.
|
||||
*/
|
||||
union VdpPictureInfo info;
|
||||
union FFVdpPictureInfo info;
|
||||
|
||||
/**
|
||||
* Allocated size of the bitstream_buffers table.
|
||||
|
@ -143,7 +143,7 @@ struct vdpau_render_state {
|
|||
VdpBitstreamBuffer *bitstream_buffers;
|
||||
|
||||
/** picture parameter information for all supported codecs */
|
||||
union VdpPictureInfo info;
|
||||
union FFVdpPictureInfo info;
|
||||
};
|
||||
|
||||
/* @}*/
|
||||
|
|
Loading…
Reference in New Issue