Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 08:02:09 +0000 (10:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 08:02:09 +0000 (10:02 +0200)
commitb0b66269f422a5c19547102c7d51504505060cc0
treea2bc6385e221692618eeb3b6289a6d15465c8455
parent57070d9892adf55b9fa475f377352b2d42e095a6
parente880418660c80e2f12a123e131975cdb6b12cd13
Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13'

* commit 'e880418660c80e2f12a123e131975cdb6b12cd13':
  cabac: remove write-only h264_mps_state[]

Conflicts:
libavcodec/cabac.c

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