Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/error_resilience: remove unneeded and disabled code

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/188/merge
Michael Niedermayer 9 years ago
parent 5694b28211
commit a7b8a6e704
1 changed files with 3 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      libavcodec/error_resilience.c

21
libavcodec/error_resilience.c
Unescape View File

@ -582,24 +582,9 @@ skip_mean_and_median:
/* zero MV */
pred_count++;
if (!fixed[mb_xy] && 0) {
if (s->avctx->codec_id == AV_CODEC_ID_H264) {
// FIXME
} else {
ff_thread_await_progress(s->last_pic.tf,
mb_y, 0);
}
if (!s->last_pic.motion_val[0] ||
!s->last_pic.ref_index[0])
goto skip_last_mv;
prev_x = s->last_pic.motion_val[0][mot_index][0];
prev_y = s->last_pic.motion_val[0][mot_index][1];
prev_ref = s->last_pic.ref_index[0][4 * mb_xy];
} else {
prev_x = s->cur_pic.motion_val[0][mot_index][0];
prev_y = s->cur_pic.motion_val[0][mot_index][1];
prev_ref = s->cur_pic.ref_index[0][4 * mb_xy];
}
prev_x = s->cur_pic.motion_val[0][mot_index][0];
prev_y = s->cur_pic.motion_val[0][mot_index][1];
prev_ref = s->cur_pic.ref_index[0][4 * mb_xy];
/* last MV */
mv_predictor[pred_count][0] = prev_x;

Write Preview
Loading…
Cancel
Save