[FFmpeg-cvslog] Merge commit '2e5bde956519ae19cedfa482e199518e495bcaf5'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Jun 21 11:25:53 2016 +0200| [2c0854f72453270e958c07b4e886f9f5323cd899] | committer: Clément Bœsch

Merge commit '2e5bde956519ae19cedfa482e199518e495bcaf5'

* commit '2e5bde956519ae19cedfa482e199518e495bcaf5':
  h264: eliminate max_contexts

This commit is a noop as max_contexts can change and mismatch the
nb_slice_ctx (see 507b01f89969601f15555f7416804fb691632cbb).

The file in the Ticket is not decodable anymore, so it was not possible
to check if that code path was triggerable some way or another, or even
test a different fix.

Merged-by: Clément Bœsch <clement at stupeflix.com>

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