Janne Grunau <[email protected]> writes: > On Sun, Apr 03, 2011 at 10:06:15PM +0200, Reinhard Tartler wrote: >> From: Gwenole Beauchesne <[email protected]> >> >> --- >> configure | 3 +-- >> libavcodec/vaapi_vc1.c | 2 ++ >> 2 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/configure b/configure >> index 92e00ad..b691f9a 100755 >> --- a/configure >> +++ b/configure >> @@ -2933,8 +2933,7 @@ check_func XFixesGetCursorImage -lX11 -lXext -lXfixes >> if ! disabled vaapi; then >> check_lib va/va.h vaInitialize -lva && { >> check_cpp_condition va/va_version.h "VA_CHECK_VERSION(0,32,0)" || >> - { echolog "Please upgrade to VA-API >= 0.32 if you would like >> VA-API support." && >> - disable vaapi; } >> + warn "Please upgrade to VA-API >= 0.32 if you would like full >> VA-API support."; >> } || disable vaapi >> fi >> >> diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c >> index 09cdd5c..5bce829 100644 >> --- a/libavcodec/vaapi_vc1.c >> +++ b/libavcodec/vaapi_vc1.c >> @@ -160,7 +160,9 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, >> av_unused const uint8_t >> pic_param->sequence_fields.bits.syncmarker = >> s->resync_marker; >> pic_param->sequence_fields.bits.rangered = >> v->rangered; >> pic_param->sequence_fields.bits.max_b_frames = >> s->avctx->max_b_frames; >> +#if VA_CHECK_VERSION(0,32,0) >> pic_param->sequence_fields.bits.profile = >> v->profile; >> +#endif >> pic_param->coded_width = >> s->avctx->coded_width; >> pic_param->coded_height = >> s->avctx->coded_height; >> pic_param->entrypoint_fields.value = 0; /* >> reset all bits */ > > ok, could be folded with patch 2/6
Fold the second hunk into the other patch, leave configure alone for now. -- Måns Rullgård [email protected] _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
