Merge commit '92e0b7342c0490894cbcea4461380321e0569de2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 19:22:34 +0000 (20:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:32:33 +0000 (21:32 +0100)
commitb1e6d8a226524a7477b626e51e4982fc72f295d9
tree70f40aadd2e40cf139d00ad18646556ea2bfc192
parent1fd1f58bd6a58f2067a8d6b4919e1a0f34eb1f22
parent92e0b7342c0490894cbcea4461380321e0569de2
Merge commit '92e0b7342c0490894cbcea4461380321e0569de2'

* commit '92e0b7342c0490894cbcea4461380321e0569de2':
  h264_slice: constify all the uses of H264Context during slice decoding

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