Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 13:56:52 +0000 (14:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 13:56:52 +0000 (14:56 +0100)
commit3d0411707839d3af1f34e0a8c7c8cbe4dd02b1ba
treeb8acca47871747e129ca6b33b06ea603fd9c6a9d
parenta1cdd1f08e06582c93fe66eacfc7c09e42321115
parentcf1e0786ed64e69614760bfb4ecd7adbde8e6094
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>
libavcodec/error_resilience.c
libavcodec/error_resilience.h
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/mpegvideo.c