summaryrefslogtreecommitdiff
path: root/libavcodec/error_resilience.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/error_resilience.c')
-rw-r--r--libavcodec/error_resilience.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 63f996ccde..58e3754b7c 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -408,7 +408,7 @@ static void v_block_filter(MpegEncContext *s, uint8_t *dst, int w, int h,
static void guess_mv(MpegEncContext *s)
{
- uint8_t *fixed = av_malloc(s->mb_stride * s->mb_height);
+ uint8_t *fixed = s->er_temp_buffer;
#define MV_FROZEN 3
#define MV_CHANGED 2
#define MV_UNCHANGED 1
@@ -470,7 +470,7 @@ static void guess_mv(MpegEncContext *s)
decode_mb(s, 0);
}
}
- goto end;
+ return;
}
for (depth = 0; ; depth++) {
@@ -722,7 +722,7 @@ skip_last_mv:
}
if (none_left)
- goto end;
+ return;
for (i = 0; i < s->mb_num; i++) {
int mb_xy = s->mb_index2xy[i];
@@ -731,8 +731,6 @@ skip_last_mv:
}
// printf(":"); fflush(stdout);
}
-end:
- av_free(fixed);
}
static int is_intra_more_likely(MpegEncContext *s)