Merge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 00:24:20 +0000 (01:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 00:24:26 +0000 (01:24 +0100)
commit84873794ad922cbcbdb5f62deda6c1ed16668bcc
treec761fa9760cf5e437266068fb38d7c788f56a786
parent70acb151591214e2287a6d7a0e863395657ee533
parentf795a8a8bf5e312dad2c2829c543b9d309376ca1
Merge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1'

* commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1':
  h264: make context_count unsigned

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c