Commit 732b2fde authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent f8217daa
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#include <vdpau/vdpau.h> #include <vdpau/vdpau.h>
#include <vdpau/vdpau_x11.h> #include <vdpau/vdpau_x11.h>
#include "libavutil/avconfig.h"
union FFVdpPictureInfo { union FFVdpPictureInfo {
VdpPictureInfoH264 h264; VdpPictureInfoH264 h264;
...@@ -135,6 +136,11 @@ struct vdpau_render_state { ...@@ -135,6 +136,11 @@ struct vdpau_render_state {
int state; ///< Holds FF_VDPAU_STATE_* values. 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. /** Describe size/location of the compressed video data.
Set to 0 when freeing bitstream_buffers. */ Set to 0 when freeing bitstream_buffers. */
int bitstream_buffers_allocated; int bitstream_buffers_allocated;
...@@ -142,8 +148,10 @@ struct vdpau_render_state { ...@@ -142,8 +148,10 @@ struct vdpau_render_state {
/** The user is responsible for freeing this buffer using av_freep(). */ /** The user is responsible for freeing this buffer using av_freep(). */
VdpBitstreamBuffer *bitstream_buffers; VdpBitstreamBuffer *bitstream_buffers;
#if !AV_HAVE_INCOMPATIBLE_FORK_ABI
/** picture parameter information for all supported codecs */ /** picture parameter information for all supported codecs */
union FFVdpPictureInfo info; union FFVdpPictureInfo info;
#endif
}; };
/* @}*/ /* @}*/
......
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