[FFmpeg-cvslog] Merge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 01:24:20 2014 +0100| [84873794ad922cbcbdb5f62deda6c1ed16668bcc] | committer: Michael Niedermayer

Merge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1'

* commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1':
  h264: make context_count unsigned

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

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