Browse Source

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>
tags/n2.0
Michael Niedermayer 12 years ago
parent
commit
732b2fde1c
1 changed files with 8 additions and 0 deletions
  1. +8
    -0
      libavcodec/vdpau.h

+ 8
- 0
libavcodec/vdpau.h View File

@@ -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
};

/* @}*/


Loading…
Cancel
Save