virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

fixing h263 slice decoding (again)

Browse Source 
Originally committed as revision 1051 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2002-10-19 23:48:08 +00:00
parent 49943a18d0
commit 35aa136a77
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h263dec.c
View File

@ -204,7 +204,7 @@ static int decode_slice(MpegEncContext *s){
if(ret<0){ if(ret<0){
const int xy= s->mb_x + s->mb_y*s->mb_width; const int xy= s->mb_x + s->mb_y*s->mb_width;
if(ret==SLICE_END){ if(ret==SLICE_END){
//printf("%d %d %06X\n", s->mb_x, s->gb.size*8 - get_bits_count(&s->gb), show_bits(&s->gb, 24)); //printf("%d %d %d %06X\n", s->mb_x, s->mb_y, s->gb.size*8 - get_bits_count(&s->gb), show_bits(&s->gb, 24));
s->error_status_table[xy]|= AC_END; s->error_status_table[xy]|= AC_END;
if(!s->partitioned_frame) if(!s->partitioned_frame)
s->error_status_table[xy]|= MV_END|DC_END; s->error_status_table[xy]|= MV_END|DC_END;
@ -420,13 +420,13 @@ uint64_t time= rdtsc();
avctx->aspected_height = s->aspected_height; avctx->aspected_height = s->aspected_height;
} }
if (s->codec_id==CODEC_ID_H263 && s->codec_id==CODEC_ID_H263)
s->gob_index = ff_h263_get_gob_height(s);
if (MPV_common_init(s) < 0) if (MPV_common_init(s) < 0)
return -1; return -1;
} }
if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P))
s->gob_index = ff_h263_get_gob_height(s);
if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size); if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size);
/* skip if the header was thrashed */ /* skip if the header was thrashed */
if (ret < 0){ if (ret < 0){