Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Feb 2014 14:41:10 +0000 (15:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Feb 2014 14:58:57 +0000 (15:58 +0100)
* qatar/master:
  h264: Fix a typo from the previous commit

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

Trivial merge