changeset 24254:575d7b1fdf82

Remove pointless #ifdef HAVE_XVMC within get_format(), all of the function is protected by that #ifdef.
author diego
date Tue, 28 Aug 2007 17:38:08 +0000
parents e0ed786a7fb9
children d6b310ab40c8
files libmpcodecs/vd_ffmpeg.c
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c	Tue Aug 28 17:36:04 2007 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Tue Aug 28 17:38:08 2007 +0000
@@ -917,7 +917,6 @@
 sh_video_t * sh = avctx->opaque;
 int i;
 
-#ifdef HAVE_XVMC
     if(avctx->xvmc_acceleration){
         vd_ffmpeg_ctx *ctx = sh->context;
         avctx->get_buffer= mc_get_buffer;
@@ -929,7 +928,6 @@
         avctx->flags|= CODEC_FLAG_EMU_EDGE;//do i need that??!!
         avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
     }
-#endif
     for(i=0;fmt[i]!=-1;i++){
         mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_TryingPixfmt,i);
         if( init_vo(sh,fmt[i]) >= 0)