Merge commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:16:29 +0000 (14:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:16:29 +0000 (14:16 +0100)
commit2cc08cad9ecf2d2524bc572a4e9bbe659b330d5c
tree22e474fc2d32d8874b8a27766006a87239fb437a
parent892a6d00280215ab4c1485c0931912f82318dc63
parent5f390eef8ee2b8adab00c5d2923a52aa261eb999
Merge commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999'

* commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999':
  h264: move mb_[uv]linesize into the per-slice context

Conflicts:
libavcodec/h264.h
libavcodec/h264_mb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.h
libavcodec/h264_mb.c
libavcodec/h264_mb_template.c
libavcodec/h264_mc_template.c
libavcodec/h264_slice.c