Merge commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:42:44 +0000 (13:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:42:44 +0000 (13:42 +0100)
commit61635c7a8822d13bc8da69e116f40738be43539a
tree79aacaa9fc966147d4c88d4465034e7eefa5d327
parenta2740a060b36f6612043fa3128f4eb6197d0ce13
parent8b00f4df20f4a8ab0656fdaf7d00233a6515a052
Merge commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052'

* commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052':
  h264: move some neighbour information into the per-slice context

Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/h264_mb_template.c
libavcodec/h264_mvpred.h
libavcodec/h264_slice.c
libavcodec/svq3.c