Mercurial > libavcodec.hg
comparison h263dec.c @ 11327:6a29fa092197 libavcodec
Process packed bitstream also for VDPAU.
author | cehoyos |
---|---|
date | Mon, 01 Mar 2010 16:52:35 +0000 |
parents | 77b3f322dba8 |
children | c66e0bc700dd |
comparison
equal
deleted
inserted
replaced
11326:cd6fa05ffeb0 | 11327:6a29fa092197 |
---|---|
661 if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){ | 661 if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){ |
662 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; | 662 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; |
663 } | 663 } |
664 | 664 |
665 assert(s->bitstream_buffer_size==0); | 665 assert(s->bitstream_buffer_size==0); |
666 frame_end: | |
666 /* divx 5.01+ bistream reorder stuff */ | 667 /* divx 5.01+ bistream reorder stuff */ |
667 if(s->codec_id==CODEC_ID_MPEG4 && s->divx_packed){ | 668 if(s->codec_id==CODEC_ID_MPEG4 && s->divx_packed){ |
668 int current_pos= get_bits_count(&s->gb)>>3; | 669 int current_pos= get_bits_count(&s->gb)>>3; |
669 int startcode_found=0; | 670 int startcode_found=0; |
670 | 671 |
695 } | 696 } |
696 | 697 |
697 intrax8_decoded: | 698 intrax8_decoded: |
698 ff_er_frame_end(s); | 699 ff_er_frame_end(s); |
699 | 700 |
700 frame_end: | |
701 if (avctx->hwaccel) { | 701 if (avctx->hwaccel) { |
702 if (avctx->hwaccel->end_frame(avctx) < 0) | 702 if (avctx->hwaccel->end_frame(avctx) < 0) |
703 return -1; | 703 return -1; |
704 } | 704 } |
705 | 705 |