Merge commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:33:27 +0000 (21:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:33:27 +0000 (21:33 +0100)
commit8bdcec31116594b07e83a8845b64a5e8172884f2
treedbeed6cee87d40ab8d9c1ded0df65d7043068846
parentb1e6d8a226524a7477b626e51e4982fc72f295d9
parent51d8725a6e4c7f989d6f0f38b59cb54a2d72846c
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@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c