Mercurial > mplayer.hg

comparison libmpcodecs/vd_ffmpeg.c @ 28595:b521607f0079

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: Remove stray empty lines.
author diego
date Tue, 17 Feb 2009 11:29:43 +0000
parents 239a2ceda4ff
children 88bb92d3c5b4
comparison
equal deleted inserted replaced
28594:df67d03dde3b 28595:b521607f0079
247 avctx->draw_horiz_band = draw_slice; 247 avctx->draw_horiz_band = draw_slice;
248 avctx->slice_flags = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; 248 avctx->slice_flags = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
249 } 249 }
250 #endif /* CONFIG_VDPAU */ 250 #endif /* CONFIG_VDPAU */
251 #if CONFIG_XVMC 251 #if CONFIG_XVMC
252
253 if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){ 252 if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){
254 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedCodec); 253 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedCodec);
255 assert(ctx->do_dr1);//these are must to! 254 assert(ctx->do_dr1);//these are must to!
256 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails 255 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails
257 avctx->get_format= get_format;//for now only this decoder will use it 256 avctx->get_format= get_format;//for now only this decoder will use it
919 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails 918 assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails
920 avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; 919 avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
921 } 920 }
922 return selected_format; 921 return selected_format;
923 } 922 }
924
925 #endif /* CONFIG_XVMC || CONFIG_VDPAU */ 923 #endif /* CONFIG_XVMC || CONFIG_VDPAU */