Browse code

vaapi: allow build against older VA-API 0.31.

Gwenole Beauchesne authored on 2011/03/30 16:29:34
Showing 2 changed files
... ...
@@ -2948,8 +2948,7 @@ check_func XFixesGetCursorImage -lX11 -lXext -lXfixes
2948 2948
 if ! disabled vaapi; then
2949 2949
     check_lib va/va.h vaInitialize -lva && {
2950 2950
         check_cpp_condition va/va_version.h "VA_CHECK_VERSION(0,32,0)" ||
2951
-        { echolog "Please upgrade to VA-API >= 0.32 if you would like VA-API support." &&
2952
-          disable vaapi; }
2951
+        warn "Please upgrade to VA-API >= 0.32 if you would like full VA-API support.";
2953 2952
     } || disable vaapi
2954 2953
 fi
2955 2954
 
... ...
@@ -160,7 +160,9 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
160 160
     pic_param->sequence_fields.bits.syncmarker                      = s->resync_marker;
161 161
     pic_param->sequence_fields.bits.rangered                        = v->rangered;
162 162
     pic_param->sequence_fields.bits.max_b_frames                    = s->avctx->max_b_frames;
163
+#if VA_CHECK_VERSION(0,32,0)
163 164
     pic_param->sequence_fields.bits.profile                         = v->profile;
165
+#endif
164 166
     pic_param->coded_width                                          = s->avctx->coded_width;
165 167
     pic_param->coded_height                                         = s->avctx->coded_height;
166 168
     pic_param->entrypoint_fields.value                              = 0; /* reset all bits */