RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2' 

* commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2':
  vdpau: use the correct namespace for the union

Conflicts:
	libavcodec/vdpau.h

See: 68dfe530e0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-12 13:40:12 +02:00
parent e9348e107b c0d973c41b
commit 0da0caa9a9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vdpau.h
View File

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