Merge commit '2a1500fb552364488cfbee3e29e296788a3a6bdd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:46:40 +0000 (00:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:46:47 +0000 (00:46 +0100)
commitcb03d29dec649efb03b895810f610e61d70800ca
tree9acc77b1f9a18e4d9e514c1f8428a93bf5adadeb
parent0d0a905152f6792901551bf3be39a38b38a36656
parent2a1500fb552364488cfbee3e29e296788a3a6bdd
Merge commit '2a1500fb552364488cfbee3e29e296788a3a6bdd'

* commit '2a1500fb552364488cfbee3e29e296788a3a6bdd':
  movenc: Fix a typo in a comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c