From 732b2fde1c84928208ec17701e9d93b4eeea2626 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 20 Mar 2013 23:25:45 +0100 Subject: [PATCH] vdpau.h: change vdpau_render_state layout to match fork if AV_HAVE_INCOMPATIBLE_FORK_ABI This might fix a compatibility issue. Signed-off-by: Michael Niedermayer --- libavcodec/vdpau.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index df2aaced26..f5b2317807 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -51,6 +51,7 @@ #include #include +#include "libavutil/avconfig.h" union FFVdpPictureInfo { VdpPictureInfoH264 h264; @@ -135,6 +136,11 @@ struct vdpau_render_state { int state; ///< Holds FF_VDPAU_STATE_* values. +#if AV_HAVE_INCOMPATIBLE_FORK_ABI + /** picture parameter information for all supported codecs */ + union FFVdpPictureInfo info; +#endif + /** Describe size/location of the compressed video data. Set to 0 when freeing bitstream_buffers. */ int bitstream_buffers_allocated; @@ -142,8 +148,10 @@ struct vdpau_render_state { /** The user is responsible for freeing this buffer using av_freep(). */ VdpBitstreamBuffer *bitstream_buffers; +#if !AV_HAVE_INCOMPATIBLE_FORK_ABI /** picture parameter information for all supported codecs */ union FFVdpPictureInfo info; +#endif }; /* @}*/