Am Do., 2. Apr. 2020 um 04:21 Uhr schrieb Fu, Linjie <linjie...@intel.com>: > > > From: ffmpeg-devel <ffmpeg-devel-boun...@ffmpeg.org> On Behalf Of > > Carl Eugen Hoyos > > Sent: Thursday, April 2, 2020 03:22 > > To: FFmpeg development discussions and patches <ffmpeg- > > de...@ffmpeg.org> > > Subject: Re: [FFmpeg-devel] [PATCH] lavc/vaapi_decode: fix the build failure > > when hevc_vaapi is disabled > > > > Am Mi., 1. Apr. 2020 um 17:24 Uhr schrieb Linjie Fu <linjie...@intel.com>: > > > > > > 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...@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) > > > > Can these lines be joined? > > Or am I missing something between the chunks? > > The complete code contains 2 different libva version checks for compatibility > which didn't show up in the diff chunks: > > #if CONFIG_HEVC_VAAPI_HWACCEL > #if VA_CHECK_VERSION(0, 37, 0) > MAP(HEVC, HEVC_MAIN, HEVCMain ), > MAP(HEVC, HEVC_MAIN_10, HEVCMain10 ), > MAP(HEVC, HEVC_MAIN_STILL_PICTURE, > HEVCMain ), > #endif > #if VA_CHECK_VERSION(1, 2, 0) > MAP(HEVC, HEVC_REXT, None, > ff_vaapi_parse_hevc_rext_profile ), > #endif > #endif
> hence I think maybe no need for a join? Of course not, sorry for not taking the time to look myself. Carl Eugen _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
