提交 ebd62a24 编写于 作者: M Michael Niedermayer

return the number of consumed bytes instead of 0 or buf_size

Originally committed as revision 731 to svn://svn.ffmpeg.org/ffmpeg/trunk
上级 ef5e74bb
......@@ -172,20 +172,20 @@ uint64_t time= rdtsc();
return -1;
}
if(ret==FRAME_SKIPED) return 0;
if(ret==FRAME_SKIPED) return (get_bits_count(&s->gb)+7)>>3;
/* skip if the header was thrashed */
if (ret < 0){
fprintf(stderr, "header damaged\n");
return -1;
}
/* skip b frames if we dont have reference frames */
if(s->num_available_buffers<2 && s->pict_type==B_TYPE) return 0;
if(s->num_available_buffers<2 && s->pict_type==B_TYPE) return buf_size;
/* skip b frames if we are in a hurry */
if(s->hurry_up && s->pict_type==B_TYPE) return 0;
if(s->hurry_up && s->pict_type==B_TYPE) return buf_size;
if(s->next_p_frame_damaged){
if(s->pict_type==B_TYPE)
return 0;
return buf_size;
else
s->next_p_frame_damaged=0;
}
......@@ -447,7 +447,7 @@ uint64_t time= rdtsc();
#ifdef PRINT_FRAME_TIME
printf("%Ld\n", rdtsc()-time);
#endif
return buf_size;
return (get_bits_count(&s->gb)+7)>>3;
}
AVCodec mpeg4_decoder = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册