[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

[Måns Rullgård]

Jai Menon <jmenon86 at gmail.com> writes:

> On Mon, Nov 16, 2009 at 2:37 PM, Alex Converse <alex.converse at gmail.com> wrote:
>> On Mon, Nov 16, 2009 at 1:12 AM, Alex Converse <alex.converse at gmail.com> wrote:
>> ...
>>>
>>> I think this should work. I only tested it on a vdpau < 0.2 system.
>>>
>>
>> This should work slightly better (tested with libvdpau-0.2)
>
> I had written a patch a few days ago, which was fixed/corrected by
> Mans, which disables just the mpeg4 vdpau support instead of disabling
> vdpau entirely in case of old headers. Any opinions on such an
> approach?

diff --git a/configure b/configure
index 613edad..8fd2ccb 100755
--- a/configure
+++ b/configure
@@ -1131,7 +1131,7 @@ mpeg2_vaapi_hwaccel_deps="va_va_h"
 mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder"
 mpeg4_vaapi_hwaccel_deps="va_va_h"
 mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder"
-mpeg4_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
+mpeg4_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h vdpau_mpeg4"
 mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder"
 mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
 mpeg_xvmc_decoder_select="mpegvideo_decoder"
@@ -2444,6 +2444,10 @@ check_header X11/extensions/XShm.h      &&
 check_func XOpenDisplay -lX11           &&
 check_func XShmCreateImage -lX11 -lXext
 
+check_cpp_condition \
+    vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" && \
+    enable vdpau_mpeg4
+
 enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
 
 # add some useful compiler flags if supported


-- 
M?ns Rullg?rd
mans at mansr.com