* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_VDPAU_RENDER_H
-#define AVCODEC_VDPAU_RENDER_H
+#ifndef AVCODEC_VDPAU_H
+#define AVCODEC_VDPAU_H
/**
* \defgroup Decoder VDPAU Decoder and Renderer
* @{
*/
-#include "vdpau/vdpau.h"
-#include "vdpau/vdpau_x11.h"
+#include <vdpau/vdpau.h>
+#include <vdpau/vdpau_x11.h>
/** \brief The videoSurface is used for rendering. */
#define FF_VDPAU_STATE_USED_FOR_RENDER 1
/** picture parameter information for all supported codecs */
union VdpPictureInfo {
- VdpPictureInfoH264 h264;
+ VdpPictureInfoH264 h264;
+ VdpPictureInfoMPEG1Or2 mpeg;
+ VdpPictureInfoVC1 vc1;
+ VdpPictureInfoMPEG4Part2 mpeg4;
} info;
- /** Describe size/location of the compressed video data. */
- int bitstreamBuffersAllocated;
- int bitstreamBuffersUsed;
- VdpBitstreamBuffer *bitstreamBuffers;
+ /** Describe size/location of the compressed video data.
+ Set to 0 when freeing bitstream_buffers. */
+ int bitstream_buffers_allocated;
+ int bitstream_buffers_used;
+ /** The user is responsible for freeing this buffer using av_freep(). */
+ VdpBitstreamBuffer *bitstream_buffers;
};
/* @}*/
-#endif /* AVCODEC_VDPAU_RENDER_H */
+#endif /* AVCODEC_VDPAU_H */