[FFmpeg-cvslog] vaapi: allow build against older VA-API 0.31.

[Gwenole Beauchesne]

ffmpeg | branch: master | Gwenole Beauchesne <gbeauchesne at splitted-desktop.com> | Wed Mar 30 09:29:34 2011 +0200| [da3716021b707d284454bd294ad9254188dd7caa] | committer: Gwenole Beauchesne

vaapi: allow build against older VA-API 0.31.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da3716021b707d284454bd294ad9254188dd7caa
---

 configure              |    3 +--
 libavcodec/vaapi_vc1.c |    2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 9cf64d2..40d5aba 100755
--- a/configure
+++ b/configure
@@ -2948,8 +2948,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 02186c3..b1dfde8 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 */