diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 16:56:52 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 16:56:52 +0300 |
commit | 3d0411707839d3af1f34e0a8c7c8cbe4dd02b1ba (patch) | |
tree | b8acca47871747e129ca6b33b06ea603fd9c6a9d /libavcodec/mpegvideo.c | |
parent | a1cdd1f08e06582c93fe66eacfc7c09e42321115 (diff) | |
parent | cf1e0786ed64e69614760bfb4ecd7adbde8e6094 (diff) |
Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094':
error_resilience: move the MECmpContext initialization into ER code
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 69665728eb..eadca4b13e 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -384,7 +384,6 @@ static av_cold int dct_init(MpegEncContext *s) ff_blockdsp_init(&s->bdsp, s->avctx); ff_h264chroma_init(&s->h264chroma, 8); //for lowres ff_hpeldsp_init(&s->hdsp, s->avctx->flags); - ff_me_cmp_init(&s->mecc, s->avctx); ff_mpegvideodsp_init(&s->mdsp); ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample); @@ -1139,7 +1138,6 @@ static int init_er(MpegEncContext *s) int i; er->avctx = s->avctx; - er->mecc = &s->mecc; er->mb_index2xy = s->mb_index2xy; er->mb_num = s->mb_num; |