[FFmpeg-cvslog] Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 25 10:02:09 2013 +0200| [b0b66269f422a5c19547102c7d51504505060cc0] | committer: Michael Niedermayer

Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13'

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

Conflicts:
	libavcodec/cabac.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0b66269f422a5c19547102c7d51504505060cc0
---