aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-09-08 18:18:49 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-08 18:18:49 +0000
commit047599a4ba6352b2b5911c10fbec821ef6612d95 (patch)
tree5720067dfc00cf9a1a86492c265e17304413bf3b /libavcodec/h264.c
parent3e30f46f8b40eb5282e0a529bef9bc95d8eea381 (diff)
downloadffmpeg-047599a4ba6352b2b5911c10fbec821ef6612d95.tar.gz
Rename error_resilience to error_recognition.
Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 98866c77af..e888f76100 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7255,7 +7255,7 @@ static void execute_decode_slices(H264Context *h, int context_count){
} else {
for(i = 1; i < context_count; i++) {
hx = h->thread_context[i];
- hx->s.error_resilience = avctx->error_resilience;
+ hx->s.error_recognition = avctx->error_recognition;
hx->s.error_count = 0;
}