Module: libav Branch: master Commit: c0d973c41b4568d5bad1295879e35cfa611bdcf2
Author: Luca Barbato <[email protected]> Committer: Luca Barbato <[email protected]> Date: Wed Jul 10 20:27:03 2013 +0200 vdpau: use the correct namespace for the union Vdp is used by libvdpau, use AVVDPAU as used for the rest. Reported-by: Alexis Ballier <[email protected]> --- libavcodec/vdpau.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 7e692f7..a589315 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 AVVDPAUPictureInfo { VdpPictureInfoH264 h264; VdpPictureInfoMPEG1Or2 mpeg; VdpPictureInfoVC1 vc1; @@ -88,7 +88,7 @@ typedef struct AVVDPAUContext { * * Set by libavcodec. */ - union VdpPictureInfo info; + union AVVDPAUPictureInfo info; /** * Allocated size of the bitstream_buffers table. @@ -136,7 +136,7 @@ struct vdpau_render_state { int state; ///< Holds FF_VDPAU_STATE_* values. /** picture parameter information for all supported codecs */ - union VdpPictureInfo info; + union AVVDPAUPictureInfo info; /** Describe size/location of the compressed video data. Set to 0 when freeing bitstream_buffers. */ _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
