[MPlayer-cvslog] r33129 - trunk/libmpcodecs/vd_ffmpeg.c

[reimar]

Author: reimar
Date: Sun Mar 27 15:19:32 2011
New Revision: 33129

Log:
Change | to  ||.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Sun Mar 27 15:18:59 2011	(r33128)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sun Mar 27 15:19:32 2011	(r33129)
@@ -303,7 +303,7 @@ static int init(sh_video_t *sh){
     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 */