Mercurial > mplayer.hg

changeset 33042:5c9771fc80cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change | to ||.
author reimar
date Sun, 27 Mar 2011 13:19:32 +0000
parents bf51474ed3fe
children 04203ae3000c
files libmpcodecs/vd_ffmpeg.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 */