# HG changeset patch
# User reimar
# Date 1301231972 0
# Node ID 5c9771fc80cdcb683aa1c08c68209db26088a3dd
# Parent  bf51474ed3fe27b98d25ccd32eba4a15e3bc6a47
Change | to  ||.

diff -r bf51474ed3fe -r 5c9771fc80cd libmpcodecs/vd_ffmpeg.c
--- a/libmpcodecs/vd_ffmpeg.c	Sun Mar 27 13:18:59 2011 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Sun Mar 27 13:19:32 2011 +0000
@@ -303,7 +303,7 @@
     avctx->codec_type = AVMEDIA_TYPE_VIDEO;
     avctx->codec_id = lavc_codec->id;
 
-#if CONFIG_VDPAU | CONFIG_XVMC
+#if CONFIG_VDPAU || CONFIG_XVMC
     if(lavc_codec->capabilities & (CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_HWACCEL))
         avctx->get_format = get_format;
 #endif /* CONFIG_VDPAU */