Mercurial > libavcodec.hg

comparison vc1.c @ 8632:6fa5b0727ddd libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics: Fix indentation after last commit.
author cehoyos
date Tue, 20 Jan 2009 09:36:28 +0000
parents 2d7269e13a8d
children 29096719e684
comparison
equal deleted inserted replaced
8631:2d7269e13a8d 8632:6fa5b0727ddd
4268 4268
4269 if ((CONFIG_VC1_VDPAU_DECODER || CONFIG_WMV3_VDPAU_DECODER) 4269 if ((CONFIG_VC1_VDPAU_DECODER || CONFIG_WMV3_VDPAU_DECODER)
4270 &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) 4270 &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
4271 ff_vdpau_vc1_decode_picture(s, buf_vdpau, (buf + buf_size) - buf_vdpau); 4271 ff_vdpau_vc1_decode_picture(s, buf_vdpau, (buf + buf_size) - buf_vdpau);
4272 else { 4272 else {
4273 ff_er_frame_start(s); 4273 ff_er_frame_start(s);
4274 4274
4275 v->bits = buf_size * 8; 4275 v->bits = buf_size * 8;
4276 vc1_decode_blocks(v); 4276 vc1_decode_blocks(v);
4277 //av_log(s->avctx, AV_LOG_INFO, "Consumed %i/%i bits\n", get_bits_count(&s->gb), buf_size*8); 4277 //av_log(s->avctx, AV_LOG_INFO, "Consumed %i/%i bits\n", get_bits_count(&s->gb), buf_size*8);
4278 // if(get_bits_count(&s->gb) > buf_size * 8) 4278 // if(get_bits_count(&s->gb) > buf_size * 8)
4279 // return -1; 4279 // return -1;
4280 ff_er_frame_end(s); 4280 ff_er_frame_end(s);
4281 } 4281 }
4282 4282
4283 MPV_frame_end(s); 4283 MPV_frame_end(s);
4284 4284
4285 assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type); 4285 assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type);