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

[Michael Niedermayer]

On Tue, Feb 05, 2013 at 10:29:19PM +0100, Reimar Döffinger wrote:
> On Tue, Feb 05, 2013 at 09:22:32PM +0100, Michael Niedermayer wrote:
> > On Tue, Feb 05, 2013 at 09:14:09PM +0100, Reimar Döffinger wrote:
> > > 
> > > 
> > > 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?
> > 
> > we can esily change from FF to AV but not the other way around due
> > to that removing a public type, which is why i choose FF
> 
> Yes, it's fine.
> I was just confused about how to interpret the FF prefix.
> I was basically wondering if it was supposed to only mean that one
> shouldn't use the name of the union or whether it would mean you
> are not supposed to look into that union itself and access its fields.
> I realized that the latter doesn't make sense, but it feels a bit
> confusing.
> Anyway, please go ahead if nobody objects.

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Asymptotically faster algorithms should always be preferred if you have
asymptotical amounts of data
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130206/1b471c83/attachment.asc>