[FFmpeg-cvslog] Merge commit '56febc993b928ccc039a32158ca60b234c311875'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 14:30:19 2015 +0100| [97c8ecaadab4e246d969fadd44072025b64747e4] | committer: Michael Niedermayer

Merge commit '56febc993b928ccc039a32158ca60b234c311875'

* commit '56febc993b928ccc039a32158ca60b234c311875':
  h264: move the slice type variables into the per-slice context

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

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

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