Commit 71529954 authored by Michael Niedermayer's avatar Michael Niedermayer

return buf_size again, i hope kabi is finally happy now ;)

Originally committed as revision 749 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 45a82edb
...@@ -172,7 +172,7 @@ uint64_t time= rdtsc(); ...@@ -172,7 +172,7 @@ uint64_t time= rdtsc();
return -1; 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 */ /* skip if the header was thrashed */
if (ret < 0){ if (ret < 0){
fprintf(stderr, "header damaged\n"); fprintf(stderr, "header damaged\n");
...@@ -447,10 +447,7 @@ uint64_t time= rdtsc(); ...@@ -447,10 +447,7 @@ uint64_t time= rdtsc();
#ifdef PRINT_FRAME_TIME #ifdef PRINT_FRAME_TIME
printf("%Ld\n", rdtsc()-time); printf("%Ld\n", rdtsc()-time);
#endif #endif
if(s->gb.size != buf_size) return buf_size;
return buf_size; //divx5 b frame reorder
else
return ((get_bits_count(&s->gb)+7)>>3) + s->bitstream_buffer_size;
} }
AVCodec mpeg4_decoder = { AVCodec mpeg4_decoder = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment