Merge commit '404a416d4b1fcbf9db5569481d8181f296c01ea9'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:00:51 +0000 (17:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:00:51 +0000 (17:00 +0100)
commiteba2c2321bc51b0faf5df379e5968ef2aa581cd8
treeef9ddfbde49c63bbd1695f9f95804d10ad7624a3
parent72bec029ee18aada1c54101f4fa0aa991355321c
parent404a416d4b1fcbf9db5569481d8181f296c01ea9
Merge commit '404a416d4b1fcbf9db5569481d8181f296c01ea9'

* commit '404a416d4b1fcbf9db5569481d8181f296c01ea9':
  h264: remove some remnants of data partitioning

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_slice.c