virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

vdpau: use the correct namespace for the union

Browse Source 
Vdp is used by libvdpau, use AVVDPAU as used for the rest.

Reported-by: Alexis Ballier <aballier@gentoo.org>
This commit is contained in:
Luca Barbato
2013-07-10 20:27:03 +02:00
parent e9d394f3fa
commit c0d973c41b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vdpau.h
View File

@@ -52,7 +52,7 @@
#include <vdpau/vdpau.h> #include <vdpau/vdpau.h>
#include <vdpau/vdpau_x11.h> #include <vdpau/vdpau_x11.h>
union VdpPictureInfo { union AVVDPAUPictureInfo {
VdpPictureInfoH264 h264; VdpPictureInfoH264 h264;
VdpPictureInfoMPEG1Or2 mpeg; VdpPictureInfoMPEG1Or2 mpeg;
VdpPictureInfoVC1 vc1; VdpPictureInfoVC1 vc1;
@@ -88,7 +88,7 @@ typedef struct AVVDPAUContext {
* *
* Set by libavcodec. * Set by libavcodec.
*/ */
union VdpPictureInfo info; union AVVDPAUPictureInfo info;
/** /**
* Allocated size of the bitstream_buffers table. * Allocated size of the bitstream_buffers table.
@@ -136,7 +136,7 @@ struct vdpau_render_state {
int state; ///< Holds FF_VDPAU_STATE_* values. int state; ///< Holds FF_VDPAU_STATE_* values.
/** picture parameter information for all supported codecs */ /** picture parameter information for all supported codecs */
union VdpPictureInfo info; union AVVDPAUPictureInfo info;
/** 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. */