Mercurial > mplayer.hg
comparison libmpcodecs/vd_ffmpeg.c @ 33042:5c9771fc80cd
Change | to ||.
author | reimar |
---|---|
date | Sun, 27 Mar 2011 13:19:32 +0000 |
parents | bf51474ed3fe |
children | 04203ae3000c |
comparison
equal
deleted
inserted
replaced
33041:bf51474ed3fe | 33042:5c9771fc80cd |
---|---|
301 avctx = ctx->avctx; | 301 avctx = ctx->avctx; |
302 avctx->opaque = sh; | 302 avctx->opaque = sh; |
303 avctx->codec_type = AVMEDIA_TYPE_VIDEO; | 303 avctx->codec_type = AVMEDIA_TYPE_VIDEO; |
304 avctx->codec_id = lavc_codec->id; | 304 avctx->codec_id = lavc_codec->id; |
305 | 305 |
306 #if CONFIG_VDPAU | CONFIG_XVMC | 306 #if CONFIG_VDPAU || CONFIG_XVMC |
307 if(lavc_codec->capabilities & (CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_HWACCEL)) | 307 if(lavc_codec->capabilities & (CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_HWACCEL)) |
308 avctx->get_format = get_format; | 308 avctx->get_format = get_format; |
309 #endif /* CONFIG_VDPAU */ | 309 #endif /* CONFIG_VDPAU */ |
310 if(ctx->do_dr1){ | 310 if(ctx->do_dr1){ |
311 avctx->flags|= CODEC_FLAG_EMU_EDGE; | 311 avctx->flags|= CODEC_FLAG_EMU_EDGE; |