ffmpeg | branch: release/2.4 | Thiago Santos <thiago.sousa.san...@collabora.com> | Sun Dec 14 22:59:27 2014 +0200| [20f9cf744a9a82ac4b269cb4317a5d59a8553baf] | committer: Luca Barbato
vaapi: wrap codec specific functions in appropiate #ifs Fix linking when only a subset of vaapi decoders is enabled. Bug-Id: 760 CC: libav-sta...@libav.org Signed-off-by: Rémi Denis-Courmont <r...@remlab.net> Signed-off-by: Luca Barbato <lu_z...@gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20f9cf744a9a82ac4b269cb4317a5d59a8553baf --- libavcodec/vaapi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c index b2dc41d..fcc6243 100644 --- a/libavcodec/vaapi.c +++ b/libavcodec/vaapi.c @@ -194,6 +194,9 @@ void ff_vaapi_common_end_frame(AVCodecContext *avctx) vactx->slice_params_alloc = 0; } +#if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG1_VAAPI_HWACCEL || \ + CONFIG_MPEG2_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL || \ + CONFIG_VC1_VAAPI_HWACCEL || CONFIG_WMV3_VAAPI_HWACCEL int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx) { struct vaapi_context * const vactx = avctx->hwaccel_context; @@ -215,5 +218,6 @@ finish: ff_vaapi_common_end_frame(avctx); return ret; } +#endif /* @} */ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
