[FFmpeg-cvslog] Merge commit 'ba7e165b864d69da4f0c79ec7757cb351535002f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 18:19:16 2015 +0100| [eb058a8dc5acf01860bd103d0ae64e68715226bc] | committer: Michael Niedermayer

Merge commit 'ba7e165b864d69da4f0c79ec7757cb351535002f'

* commit 'ba7e165b864d69da4f0c79ec7757cb351535002f':
  h264_cabac: constify all uses of H264Context

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

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