RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/error_resilience: make error an local variable where possible 

This makes the code easier to understand as the scope of the variable is
smaller.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-02 22:04:08 +02:00
parent 459996325d
commit c103c48525
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/error_resilience.c
View File

@ -1057,7 +1057,7 @@ void ff_er_frame_end(ERContext *s)
if (!s->partitioned_frame) { if (!s->partitioned_frame) {
for (i = 0; i < s->mb_num; i++) { for (i = 0; i < s->mb_num; i++) {
const int mb_xy = s->mb_index2xy[i]; const int mb_xy = s->mb_index2xy[i];
error = s->error_status_table[mb_xy]; int error = s->error_status_table[mb_xy];
if (error & ER_MB_ERROR) if (error & ER_MB_ERROR)
error |= ER_MB_ERROR; error |= ER_MB_ERROR;
s->error_status_table[mb_xy] = error; s->error_status_table[mb_xy] = error;
@ -1068,7 +1068,7 @@ void ff_er_frame_end(ERContext *s)
dc_error = ac_error = mv_error = 0; dc_error = ac_error = mv_error = 0;
for (i = 0; i < s->mb_num; i++) { for (i = 0; i < s->mb_num; i++) {
const int mb_xy = s->mb_index2xy[i]; const int mb_xy = s->mb_index2xy[i];
error = s->error_status_table[mb_xy]; int error = s->error_status_table[mb_xy];
if (error & ER_DC_ERROR) if (error & ER_DC_ERROR)
dc_error++; dc_error++;
if (error & ER_AC_ERROR) if (error & ER_AC_ERROR)
@ -1084,7 +1084,7 @@ void ff_er_frame_end(ERContext *s)
/* set unknown mb-type to most likely */ /* set unknown mb-type to most likely */
for (i = 0; i < s->mb_num; i++) { for (i = 0; i < s->mb_num; i++) {
const int mb_xy = s->mb_index2xy[i]; const int mb_xy = s->mb_index2xy[i];
error = s->error_status_table[mb_xy]; int error = s->error_status_table[mb_xy];
if (!((error & ER_DC_ERROR) && (error & ER_MV_ERROR))) if (!((error & ER_DC_ERROR) && (error & ER_MV_ERROR)))
continue; continue;
@ -1112,7 +1112,7 @@ void ff_er_frame_end(ERContext *s)
const int mv_dir = dir ? MV_DIR_BACKWARD : MV_DIR_FORWARD; const int mv_dir = dir ? MV_DIR_BACKWARD : MV_DIR_FORWARD;
int mv_type; int mv_type;
error = s->error_status_table[mb_xy]; int error = s->error_status_table[mb_xy];
if (IS_INTRA(mb_type)) if (IS_INTRA(mb_type))
continue; // intra continue; // intra
@ -1149,7 +1149,7 @@ void ff_er_frame_end(ERContext *s)
const int mb_type = s->cur_pic.mb_type[mb_xy]; const int mb_type = s->cur_pic.mb_type[mb_xy];
int mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; int mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
error = s->error_status_table[mb_xy]; int error = s->error_status_table[mb_xy];
if (IS_INTRA(mb_type)) if (IS_INTRA(mb_type))
continue; continue;
@ -1253,7 +1253,7 @@ void ff_er_frame_end(ERContext *s)
const int mb_xy = mb_x + mb_y * s->mb_stride; const int mb_xy = mb_x + mb_y * s->mb_stride;
const int mb_type = s->cur_pic.mb_type[mb_xy]; const int mb_type = s->cur_pic.mb_type[mb_xy];
error = s->error_status_table[mb_xy]; int error = s->error_status_table[mb_xy];
if (IS_INTER(mb_type)) if (IS_INTER(mb_type))
continue; continue;