From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 14 Feb 2014 00:24:20 +0000 (+0100)
Subject: Merge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=84873794ad922cbcbdb5f62deda6c1ed16668bcc;p=ffmpeg

Merge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1'

* commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1':
  h264: make context_count unsigned

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

84873794ad922cbcbdb5f62deda6c1ed16668bcc