har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix rv20 b frames (broke since r5264 Mon Apr 3 07:52:24 2006 UTC 2x faster ff_mpeg4_set_direct_mv)

Browse Source 
Originally committed as revision 6388 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-09-29 23:34:42 +00:00
parent b2f86c170d
commit 6d3124961b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h263.c
View File

@ -556,7 +556,7 @@ void ff_clean_mpeg4_qscales(MpegEncContext *s){
#define tab_size ((signed)(sizeof(s->direct_scale_mv[0])/sizeof(int16_t))) #define tab_size ((signed)(sizeof(s->direct_scale_mv[0])/sizeof(int16_t)))
#define tab_bias (tab_size/2) #define tab_bias (tab_size/2)
static void ff_mpeg4_init_direct_mv(MpegEncContext *s){ void ff_mpeg4_init_direct_mv(MpegEncContext *s){
int i; int i;
for(i=0; i<tab_size; i++){ for(i=0; i<tab_size; i++){
s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time; s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time;

1
libavcodec/rv10.c
View File

@ -473,6 +473,7 @@ static int rv20_decode_picture_header(MpegEncContext *s)
av_log(s->avctx, AV_LOG_DEBUG, "messed up order, possible from seeking? skipping current b frame\n"); av_log(s->avctx, AV_LOG_DEBUG, "messed up order, possible from seeking? skipping current b frame\n");
return FRAME_SKIPPED; return FRAME_SKIPPED;
} }
ff_mpeg4_init_direct_mv(s);
} }
} }
// printf("%d %d %d %d %d\n", seq, (int)s->time, (int)s->last_non_b_time, s->pp_time, s->pb_time); // printf("%d %d %d %d %d\n", seq, (int)s->time, (int)s->last_non_b_time, s->pp_time, s->pb_time);