Commit 68dfe530 authored by Michael Niedermayer's avatar Michael Niedermayer

vdpau: Rename union, avoid name conflict with vdpau

Fixes Ticket2203
Reviewed-by: 's avatarReimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent ccf9dd00
......@@ -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;
};
/* @}*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment