diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 23:25:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 23:22:33 +0100 |
| commit | 732b2fde1c84928208ec17701e9d93b4eeea2626 (patch) | |
| tree | 9724af3b6e9b8bcc2e29a760e019e159e748f3df /libavcodec/vdpau.h | |
| parent | f8217daa8e771641e4dc567f89584126874dd9db (diff) | |
| download | ffmpeg-732b2fde1c84928208ec17701e9d93b4eeea2626.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.h')
| -rw-r--r-- | libavcodec/vdpau.h | 8 |
1 files changed, 8 insertions, 0 deletions
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 <vdpau/vdpau.h> #include <vdpau/vdpau_x11.h> +#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 }; /* @}*/ |