mirror of
https://github.com/mpv-player/mpv
synced 2024-10-30 04:46:41 +01:00
Convert CONFIG_XVMC into a 0/1 definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28447 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
4557c10cb0
commit
edc3c57aee
@ -26,7 +26,7 @@ LIBVD_EXTERN(ffmpeg)
|
||||
|
||||
#include "libavcodec/avcodec.h"
|
||||
|
||||
#ifdef CONFIG_XVMC
|
||||
#if CONFIG_XVMC
|
||||
#include "xvmc_render.h"
|
||||
#endif
|
||||
|
||||
@ -59,7 +59,7 @@ typedef struct {
|
||||
static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
|
||||
static void release_buffer(AVCodecContext *avctx, AVFrame *pic);
|
||||
|
||||
#ifdef CONFIG_XVMC
|
||||
#if CONFIG_XVMC
|
||||
static enum PixelFormat get_format(struct AVCodecContext * avctx,
|
||||
const enum PixelFormat * pix_fmt);
|
||||
static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic);
|
||||
@ -143,7 +143,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
|
||||
if(avctx->pix_fmt==PIX_FMT_YUV420P) return CONTROL_TRUE;// u/v swap
|
||||
if(avctx->pix_fmt==PIX_FMT_YUV422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride
|
||||
break;
|
||||
#ifdef CONFIG_XVMC
|
||||
#if CONFIG_XVMC
|
||||
case IMGFMT_XVMC_IDCT_MPEG2:
|
||||
case IMGFMT_XVMC_MOCO_MPEG2:
|
||||
if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE;
|
||||
@ -250,7 +250,7 @@ static int init(sh_video_t *sh){
|
||||
ctx->avctx = avcodec_alloc_context();
|
||||
avctx = ctx->avctx;
|
||||
|
||||
#ifdef CONFIG_XVMC
|
||||
#if CONFIG_XVMC
|
||||
|
||||
#ifdef CODEC_CAP_HWACCEL
|
||||
if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){
|
||||
@ -533,7 +533,7 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){
|
||||
case PIX_FMT_RGB565: ctx->best_csp=IMGFMT_BGR16;break; //4xm
|
||||
case PIX_FMT_GRAY8: ctx->best_csp=IMGFMT_Y800;break; // gray jpeg
|
||||
case PIX_FMT_PAL8: ctx->best_csp=IMGFMT_BGR8;break; //8bps,mrle,cram
|
||||
#ifdef CONFIG_XVMC
|
||||
#if CONFIG_XVMC
|
||||
case PIX_FMT_XVMC_MPEG2_MC:ctx->best_csp=IMGFMT_XVMC_MOCO_MPEG2;break;
|
||||
case PIX_FMT_XVMC_MPEG2_IDCT:ctx->best_csp=IMGFMT_XVMC_IDCT_MPEG2;break;
|
||||
#endif
|
||||
@ -910,7 +910,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
|
||||
return mpi;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_XVMC
|
||||
#if CONFIG_XVMC
|
||||
static enum PixelFormat get_format(struct AVCodecContext * avctx,
|
||||
const enum PixelFormat * fmt){
|
||||
sh_video_t * sh = avctx->opaque;
|
||||
|
Loading…
Reference in New Issue
Block a user