[FFmpeg-cvslog] Merge commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 21:33:27 2015 +0100| [8bdcec31116594b07e83a8845b64a5e8172884f2] | committer: Michael Niedermayer

Merge commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c'

* commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c':
  h264: use the main H264Context as the parent for all slice contexts

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

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

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