diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 21:46:28 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 21:54:56 +0400 |
commit | 1fad547cefb4d2f3ed3d764b547ee16cf399e477 (patch) | |
tree | e0c261a8eb1823e1ab9235d1ff7c66a8058a247c /libavcodec/intrax8.c | |
parent | 2bac1535db970e981e90306d64f2252be4c9fd63 (diff) | |
parent | 54974c62982ae827becdbdb9b620b7ba75d079a0 (diff) |
Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'
* commit '54974c62982ae827becdbdb9b620b7ba75d079a0':
error_resilience: decouple ER from MpegEncContext
Conflicts:
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/intrax8.c')
-rw-r--r-- | libavcodec/intrax8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index fe1e770a18..be524d6be7 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -781,7 +781,7 @@ int ff_intrax8_decode_picture(IntraX8Context * const w, int dquant, int quant_of } error: - ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, + ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, (s->mb_x>>1)-1, (s->mb_y>>1)-1, ER_MB_END ); return 0; |