Merge commit '30da98adbda6de1f55188f9058a3a5c715049633'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:45:44 +0000 (15:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:45:44 +0000 (15:45 +0100)
commitf5d4d618242f412626f65e5f9b5a069448bf219b
treee32a6ffc0d136b365026e6ed1ca55252f8c856be
parentd86e8f235e59e1f5f49fda8eeabd69bfb8396549
parent30da98adbda6de1f55188f9058a3a5c715049633
Merge commit '30da98adbda6de1f55188f9058a3a5c715049633'

* commit '30da98adbda6de1f55188f9058a3a5c715049633':
  h264: move cabac[_state] into the per-slice context

Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_slice.c

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