[FFmpeg-devel] [PATCH] lavc/vaapi_decode: fix the build failure when hevc_vaapi is disabled

[Fu, Linjie]

> From: ffmpeg-devel <ffmpeg-devel-bounces at ffmpeg.org> On Behalf Of
> Mark Thompson
> Sent: Sunday, April 12, 2020 20:14
> To: ffmpeg-devel at ffmpeg.org
> Subject: Re: [FFmpeg-devel] [PATCH] lavc/vaapi_decode: fix the build failure
> when hevc_vaapi is disabled
> 
> On 12/04/2020 12:55, Andreas Rheinhardt wrote:
> > Linjie Fu:
> >> Verified with ./configure --enable-vaapi --disable-hwaccel=hevc_vaapi
> >>
> >> Failure reported in:
> >> http://fate.ffmpeg.org/report.cgi?time=20200401135031&slot=x86_64-
> archlinux-gcc-random
> >>
> >> Signed-off-by: Linjie Fu <linjie.fu at intel.com>
> >> ---
> >>  libavcodec/vaapi_decode.c | 2 ++
> >>  1 file changed, 2 insertions(+)
> >>
> >> diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
> >> index 54a0ecb..06916cc 100644
> >> --- a/libavcodec/vaapi_decode.c
> >> +++ b/libavcodec/vaapi_decode.c
> >> @@ -383,6 +383,7 @@ static const struct {
> >>                             H264ConstrainedBaseline),
> >>      MAP(H264,        H264_MAIN,       H264Main    ),
> >>      MAP(H264,        H264_HIGH,       H264High    ),
> >> +#if CONFIG_HEVC_VAAPI_HWACCEL
> >>  #if VA_CHECK_VERSION(0, 37, 0)
> >>      MAP(HEVC,        HEVC_MAIN,       HEVCMain    ),
> >>      MAP(HEVC,        HEVC_MAIN_10,    HEVCMain10  ),
> >> @@ -393,6 +394,7 @@ static const struct {
> >>      MAP(HEVC,        HEVC_REXT,       None,
> >>                   ff_vaapi_parse_hevc_rext_profile ),
> >>  #endif
> >> +#endif
> >>      MAP(MJPEG,       MJPEG_HUFFMAN_BASELINE_DCT,
> >>                                        JPEGBaseline),
> >>      MAP(WMV3,        VC1_SIMPLE,      VC1Simple   ),
> >>
> > Any more comments? If not, I'll apply this soon (i.e. in a few hours).
> 
> I'd put it around the RExt part only, to be more consistent with other codecs.
Ok, and  also combined with VA_CHECK_VERSION as Carl has suggested, thx.

- Linjie