diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:40:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:47:37 +0200 |
| commit | 0da0caa9a9ea1a2d7471f51a11fd90c08fbcd3fb (patch) | |
| tree | 61ca4fcc5ea644dd4099a41b5efb5a9a1de99472 /libavcodec/vdpau.h | |
| parent | e9348e107bafcf0106c52f582d70fa53716b4ac4 (diff) | |
| parent | c0d973c41b4568d5bad1295879e35cfa611bdcf2 (diff) | |
| download | ffmpeg-0da0caa9a9ea1a2d7471f51a11fd90c08fbcd3fb.tar.gz | |
Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2'
* commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2':
vdpau: use the correct namespace for the union
Conflicts:
libavcodec/vdpau.h
See: 68dfe530e0fb03b4d21dfe37f8a572b95c68485e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.h')
| -rw-r--r-- | libavcodec/vdpau.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index a8d708cd3b..37d212cd86 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -53,7 +53,7 @@ #include <vdpau/vdpau_x11.h> #include "libavutil/avconfig.h" -union FFVdpPictureInfo { +union AVVDPAUPictureInfo { VdpPictureInfoH264 h264; VdpPictureInfoMPEG1Or2 mpeg; VdpPictureInfoVC1 vc1; @@ -89,7 +89,7 @@ typedef struct AVVDPAUContext { * * Set by libavcodec. */ - union FFVdpPictureInfo info; + union AVVDPAUPictureInfo info; /** * Allocated size of the bitstream_buffers table. @@ -138,7 +138,7 @@ struct vdpau_render_state { #if AV_HAVE_INCOMPATIBLE_LIBAV_ABI /** picture parameter information for all supported codecs */ - union FFVdpPictureInfo info; + union AVVDPAUPictureInfo info; #endif /** Describe size/location of the compressed video data. @@ -150,7 +150,7 @@ struct vdpau_render_state { #if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI /** picture parameter information for all supported codecs */ - union FFVdpPictureInfo info; + union AVVDPAUPictureInfo info; #endif }; |