Mercurial > libavcodec.hg
comparison mpegvideo.c @ 8342:e76576f38ade libavcodec
Switch xvmc over to a CONFIG_ option.
author | diego |
---|---|
date | Mon, 15 Dec 2008 22:22:51 +0000 |
parents | cf4d575b1982 |
children | 9281a8a9387a |
comparison
equal
deleted
inserted
replaced
8341:750453ac8c90 | 8342:e76576f38ade |
---|---|
937 assert(s->avctx->noise_reduction && s->encoding); | 937 assert(s->avctx->noise_reduction && s->encoding); |
938 | 938 |
939 update_noise_reduction(s); | 939 update_noise_reduction(s); |
940 } | 940 } |
941 | 941 |
942 #ifdef HAVE_XVMC | 942 #ifdef CONFIG_XVMC |
943 if(s->avctx->xvmc_acceleration) | 943 if(s->avctx->xvmc_acceleration) |
944 return XVMC_field_start(s, avctx); | 944 return XVMC_field_start(s, avctx); |
945 #endif | 945 #endif |
946 return 0; | 946 return 0; |
947 } | 947 } |
949 /* generic function for encode/decode called after a frame has been coded/decoded */ | 949 /* generic function for encode/decode called after a frame has been coded/decoded */ |
950 void MPV_frame_end(MpegEncContext *s) | 950 void MPV_frame_end(MpegEncContext *s) |
951 { | 951 { |
952 int i; | 952 int i; |
953 /* draw edge for correct motion prediction if outside */ | 953 /* draw edge for correct motion prediction if outside */ |
954 #ifdef HAVE_XVMC | 954 #ifdef CONFIG_XVMC |
955 //just to make sure that all data is rendered. | 955 //just to make sure that all data is rendered. |
956 if(s->avctx->xvmc_acceleration){ | 956 if(s->avctx->xvmc_acceleration){ |
957 XVMC_field_end(s); | 957 XVMC_field_end(s); |
958 }else | 958 }else |
959 #endif | 959 #endif |
1730 void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], | 1730 void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], |
1731 int lowres_flag, int is_mpeg12) | 1731 int lowres_flag, int is_mpeg12) |
1732 { | 1732 { |
1733 int mb_x, mb_y; | 1733 int mb_x, mb_y; |
1734 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; | 1734 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; |
1735 #ifdef HAVE_XVMC | 1735 #ifdef CONFIG_XVMC |
1736 if(s->avctx->xvmc_acceleration){ | 1736 if(s->avctx->xvmc_acceleration){ |
1737 XVMC_decode_mb(s);//xvmc uses pblocks | 1737 XVMC_decode_mb(s);//xvmc uses pblocks |
1738 return; | 1738 return; |
1739 } | 1739 } |
1740 #endif | 1740 #endif |