git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'
[ffmpeg.git]
/
libavcodec
/
error_resilience.c
diff --git
a/libavcodec/error_resilience.c
b/libavcodec/error_resilience.c
index
078dc9f
..
da957d2
100644
(file)
--- a/
libavcodec/error_resilience.c
+++ b/
libavcodec/error_resilience.c
@@
-895,7
+895,6
@@
void ff_er_frame_end(ERContext *s)
}
return;
}
- s->cur_pic->f.motion_subsample_log2 = 3;
}
if (s->avctx->debug & FF_DEBUG_ER) {