Mercurial > libavcodec.hg
comparison h263dec.c @ 543:8f8f4885d874 libavcodec
return buf_size again, i hope kabi is finally happy now ;)
author | michaelni |
---|---|
date | Sat, 13 Jul 2002 15:03:47 +0000 |
parents | d2147d9704ce |
children | 18ad513d92fe |
comparison
equal
deleted
inserted
replaced
542:d55978a3c369 | 543:8f8f4885d874 |
---|---|
170 MPV_common_end(s); | 170 MPV_common_end(s); |
171 if (MPV_common_init(s) < 0) | 171 if (MPV_common_init(s) < 0) |
172 return -1; | 172 return -1; |
173 } | 173 } |
174 | 174 |
175 if(ret==FRAME_SKIPED) return (get_bits_count(&s->gb)+7)>>3; | 175 if(ret==FRAME_SKIPED) return buf_size; |
176 /* skip if the header was thrashed */ | 176 /* skip if the header was thrashed */ |
177 if (ret < 0){ | 177 if (ret < 0){ |
178 fprintf(stderr, "header damaged\n"); | 178 fprintf(stderr, "header damaged\n"); |
179 return -1; | 179 return -1; |
180 } | 180 } |
445 if(s->num_available_buffers>=2 || (!s->has_b_frames)) | 445 if(s->num_available_buffers>=2 || (!s->has_b_frames)) |
446 *data_size = sizeof(AVPicture); | 446 *data_size = sizeof(AVPicture); |
447 #ifdef PRINT_FRAME_TIME | 447 #ifdef PRINT_FRAME_TIME |
448 printf("%Ld\n", rdtsc()-time); | 448 printf("%Ld\n", rdtsc()-time); |
449 #endif | 449 #endif |
450 if(s->gb.size != buf_size) | 450 return buf_size; |
451 return buf_size; //divx5 b frame reorder | |
452 else | |
453 return ((get_bits_count(&s->gb)+7)>>3) + s->bitstream_buffer_size; | |
454 } | 451 } |
455 | 452 |
456 AVCodec mpeg4_decoder = { | 453 AVCodec mpeg4_decoder = { |
457 "mpeg4", | 454 "mpeg4", |
458 CODEC_TYPE_VIDEO, | 455 CODEC_TYPE_VIDEO, |