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)
* commit '92e0b7342c0490894cbcea4461380321e0569de2':
  h264_slice: constify all the uses of H264Context during slice decoding

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

Simple merge