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)
commitf98821dddb4abb3764fc2f22a6afe3eb11292d3c
tree90a82a51e8ec1d98854d8466c37d5877ed5db46b
parent3c096751ffe85861cd88ee822b86f10155b7b639
parentd922c5a5fbaf0b6c73bd8c81ae059bc6e406961c
Merge remote-tracking branch 'qatar/master'

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

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