MERGE 3564 libavcodec/mpegvideo_enc.c MERGE(me.scene_change_score); MERGE 3565 libavcodec/mpegvideo_enc.c MERGE(me.mc_mb_var_sum_temp); MERGE 3566 libavcodec/mpegvideo_enc.c MERGE(me.mb_var_sum_temp); MERGE 3572 libavcodec/mpegvideo_enc.c MERGE(dct_count[0]); //note, the other dct vars are not part of the context MERGE 3573 libavcodec/mpegvideo_enc.c MERGE(dct_count[1]); MERGE 3574 libavcodec/mpegvideo_enc.c MERGE(mv_bits); MERGE 3575 libavcodec/mpegvideo_enc.c MERGE(i_tex_bits); MERGE 3576 libavcodec/mpegvideo_enc.c MERGE(p_tex_bits); MERGE 3577 libavcodec/mpegvideo_enc.c MERGE(i_count); MERGE 3578 libavcodec/mpegvideo_enc.c MERGE(f_count); MERGE 3579 libavcodec/mpegvideo_enc.c MERGE(b_count); MERGE 3580 libavcodec/mpegvideo_enc.c MERGE(skip_count); MERGE 3581 libavcodec/mpegvideo_enc.c MERGE(misc_bits); MERGE 3582 libavcodec/mpegvideo_enc.c MERGE(er.error_count); MERGE 3583 libavcodec/mpegvideo_enc.c MERGE(padding_bug_score); MERGE 3584 libavcodec/mpegvideo_enc.c MERGE(current_picture.encoding_error[0]); MERGE 3585 libavcodec/mpegvideo_enc.c MERGE(current_picture.encoding_error[1]); MERGE 3586 libavcodec/mpegvideo_enc.c MERGE(current_picture.encoding_error[2]); MERGE 3590 libavcodec/mpegvideo_enc.c MERGE(dct_error_sum[0][i]); MERGE 3591 libavcodec/mpegvideo_enc.c MERGE(dct_error_sum[1][i]); MERGE 1000 libavcodec/vp9block.c MERGE(l, end_y, step, rd); \ MERGE 1001 libavcodec/vp9block.c MERGE(a, end_x, step, rd); \