diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-02 20:42:07 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-02-15 16:10:11 +0100 |
| commit | 54974c62982ae827becdbdb9b620b7ba75d079a0 (patch) | |
| tree | b98128b3369cd366a92bba010358e9548fd356c5 /libavcodec/mpegvideo_enc.c | |
| parent | d9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc (diff) | |
| download | ffmpeg-54974c62982ae827becdbdb9b620b7ba75d079a0.tar.gz | |
error_resilience: decouple ER from MpegEncContext
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index a99c8deaa6..3ba6f81618 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3037,7 +3037,7 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src) MERGE(b_count); MERGE(skip_count); MERGE(misc_bits); - MERGE(error_count); + MERGE(er.error_count); MERGE(padding_bug_score); MERGE(current_picture.f.error[0]); MERGE(current_picture.f.error[1]); |