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)
* commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1':
  h264: make context_count unsigned

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

Simple merge