[FFmpeg-cvslog] Merge commit '30da98adbda6de1f55188f9058a3a5c715049633'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 15:45:44 2015 +0100| [f5d4d618242f412626f65e5f9b5a069448bf219b] | committer: Michael Niedermayer

Merge commit '30da98adbda6de1f55188f9058a3a5c715049633'

* commit '30da98adbda6de1f55188f9058a3a5c715049633':
  h264: move cabac[_state] into the per-slice context

Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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