[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:26 PM, Alex Converse <alex.converse at gmail.com> wrote:
> 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.
>>

Here is a version that uses an ifdef from an included dependent public
header (vdpau_mepg4_compilation.diff)

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

Also attached is an approach that completely disables vdpau if MPEG-4
support is missing. (vdpau-0.2.diff)

I think the current situation is completely unacceptable. If the first
solution is still unacceptable then I think we should move forward
with shutting vdpau off for old headers.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: vdpau_mpeg4_compilation.diff
Type: text/x-patch
Size: 2114 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20091212/d3b7258b/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: vdpau-0.2.diff
Type: text/x-patch
Size: 591 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20091212/d3b7258b/attachment-0001.bin>