summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-07-13 15:03:47 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-07-13 15:03:47 +0000
commit71529954c6d588ec43565155184568c34ed4381a (patch)
tree93db41c15b8d115d440de981880154ff426be7dc
parent45a82edbdd041c264521600d5c8195d279c0211e (diff)
return buf_size again, i hope kabi is finally happy now ;)
Originally committed as revision 749 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h263dec.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 9df7082d89..95b4eaf1cd 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -172,7 +172,7 @@ uint64_t time= rdtsc();
return -1;
}
- if(ret==FRAME_SKIPED) return (get_bits_count(&s->gb)+7)>>3;
+ if(ret==FRAME_SKIPED) return buf_size;
/* skip if the header was thrashed */
if (ret < 0){
fprintf(stderr, "header damaged\n");
@@ -447,10 +447,7 @@ uint64_t time= rdtsc();
#ifdef PRINT_FRAME_TIME
printf("%Ld\n", rdtsc()-time);
#endif
- if(s->gb.size != buf_size)
- return buf_size; //divx5 b frame reorder
- else
- return ((get_bits_count(&s->gb)+7)>>3) + s->bitstream_buffer_size;
+ return buf_size;
}
AVCodec mpeg4_decoder = {