diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 20:17:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 01:43:36 +0100 |
| commit | 68dfe530e0fb03b4d21dfe37f8a572b95c68485e (patch) | |
| tree | f34a374cd506c1b2864c9e67d198371aa1f1f385 /libavcodec | |
| parent | ccf9dd00da055e94117b56cead4af80ff331b00e (diff) | |
| download | ffmpeg-68dfe530e0fb03b4d21dfe37f8a572b95c68485e.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vdpau.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 7933a79172..df2aaced26 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -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; }; /* @}*/ |