[FFmpeg-devel] [PATCH] vdpau: Rename union, avoid name conflict with vdpau

Reimar Döffinger Reimar.Doeffinger at gmx.de
Tue Feb 5 21:14:09 CET 2013



On 5 Feb 2013, at 20:18, Michael Niedermayer <michaelni at gmx.at> wrote:

> Fixes Ticket2203
> 
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> ---
> libavcodec/vdpau.h |    6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
> index 7933a79..df2aace 100644
> --- a/libavcodec/vdpau.h
> +++ b/libavcodec/vdpau.h
> @@ -52,7 +52,7 @@
> #include <vdpau/vdpau.h>
> #include <vdpau/vdpau_x11.h>
> 
> -union VdpPictureInfo {
> +union FFVdpPictureInfo {

Since vdpau.h is an installed header, should it be AV instead of FF?
Or if its FF because people should not rely on the name of the union maybe that should be said in a comment?
But those are just nits, I think it's ok.


More information about the ffmpeg-devel mailing list