[FFmpeg-cvslog] vdpau.h: change vdpau_render_state layout to match fork if AV_HAVE_INCOMPATIBLE_FORK_ABI

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 20 23:25:45 2013 +0100| [732b2fde1c84928208ec17701e9d93b4eeea2626] | committer: 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: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=732b2fde1c84928208ec17701e9d93b4eeea2626
---

 libavcodec/vdpau.h |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index df2aace..f5b2317 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
 };
 
 /* @}*/