diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-28 17:38:08 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-28 17:38:08 +0000 |
| commit | 90aa63e2fd28abe62a33ce3192b9519a9b48b5d5 (patch) | |
| tree | 62b1cdd257c5a262b077cbc73ac57405e39db04d /libmpcodecs | |
| parent | 89855e10223511835efe930193f4d527dcd1f01f (diff) | |
| download | mpv-90aa63e2fd28abe62a33ce3192b9519a9b48b5d5.tar.bz2 mpv-90aa63e2fd28abe62a33ce3192b9519a9b48b5d5.tar.xz | |
Remove pointless #ifdef HAVE_XVMC within get_format(), all of the function
is protected by that #ifdef.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24274 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index d619dbe566..3477fceed7 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -917,7 +917,6 @@ static enum PixelFormat get_format(struct AVCodecContext * avctx, 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 @@ int i; 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) |