generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vdpau.h: change vdpau_render_state layout to match fork if AV_HAVE_INCOMPATIBLE_FORK_ABI

Browse Source 
This might fix a compatibility issue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-20 23:25:45 +01:00
parent f8217daa8e
commit 732b2fde1c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vdpau.h
View File

@ -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 {
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 {
/** 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
}; };
/* @}*/ /* @}*/