From ffc3db22395b2a505e2f9ef6e805650c9b375731 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 21 Jan 2010 00:58:06 +0200 Subject: vd_ffmpeg: fix compilation with neither VDPAU nor XvMC enabled The get_format() function was defined under #if CONFIG_XVMC || CONFIG_VDPAU but recent commit ca217f4557c3cff4f2bf33e605ce13e662e84a92 added an unconditional reference to it, causing linking to fail with an undefined reference if neither feature was enabled. Fix by removing the #if, there's no reason reason why it would be needed. --- libmpcodecs/vd_ffmpeg.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'libmpcodecs/vd_ffmpeg.c') diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 1610f6dce3..876dd24411 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -864,7 +864,6 @@ static struct mp_image *decode(struct sh_video *sh, void *data, int len, return mpi; } -#if CONFIG_XVMC || CONFIG_VDPAU static enum PixelFormat get_format(struct AVCodecContext *avctx, const enum PixelFormat *fmt){ enum PixelFormat selected_format; @@ -883,7 +882,6 @@ static enum PixelFormat get_format(struct AVCodecContext *avctx, selected_format = fmt[i]; return selected_format; } -#endif /* CONFIG_XVMC || CONFIG_VDPAU */ const struct vd_functions mpcodecs_vd_ffmpeg = { .info = &info, -- cgit v1.2.3