[FFmpeg-cvslog] Merge commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 13:42:44 2015 +0100| [61635c7a8822d13bc8da69e116f40738be43539a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61635c7a8822d13bc8da69e116f40738be43539a
---