Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: Fix a typo from the previous commit

See: 76dd01ecd4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-22 15:41:10 +01:00
commit f98821dddb

Diff Content Not Available