[FFmpeg-cvslog] r20502 - in trunk: configure libavcodec/allcodecs.c libavcodec/h263dec.c libavcodec/imgconvert.c libavcodec/vdpau.c libavcodec/vdpau.h libavcodec/vdpau_internal.h libavutil/pixfmt.h

[Alex Converse]

On Tue, Dec 8, 2009 at 4:19 PM, Uoti Urpala <uoti.urpala at pp1.inet.fi> wrote:
> On Tue, 2009-12-08 at 15:52 -0500, Alex Converse wrote:
>> The attached patch should work but I don't want to roll back my vdpau
>> to verify it.
>>
>> Can someone else test?
>
>
>> diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
>> index a8fa4d3..64762ac 100644
>> --- a/libavcodec/vdpau.h
>> +++ b/libavcodec/vdpau.h
>> @@ -73,7 +73,9 @@ struct vdpau_render_state {
>> ? ? ? ? ?VdpPictureInfoH264 ? ? ? ?h264;
>> ? ? ? ? ?VdpPictureInfoMPEG1Or2 ? ?mpeg;
>> ? ? ? ? ?VdpPictureInfoVC1 ? ? ? ? ?vc1;
>> +#if CONFIG_MPEG4_VDPAU_DECODER
>> ? ? ? ? ?VdpPictureInfoMPEG4Part2 mpeg4;
>> +#endif
>
> libavcodec/vdpau.h is a public header, you can't use FFmpeg CONFIG_*
> defines in it. This would compile OK when building FFmpeg but
> applications including the installed header would not be able to use the
> field unless they set that same define. That's why I explicitly
> mentioned the bit about "#ifdef in a public header" in my earlier mail.
>

Well we could always go back to my old solution which was shelved in
favor of this "ideal" mess.