Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 12:29:42 +0000 (13:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 12:29:46 +0000 (13:29 +0100)
commitd078d57fb769e83c00c402f2f34978c1cd50dce7
tree35172878fd5d228325ff31169bf8ac67cf5053a8
parent010311d67337419b218f0834b019821b08552127
parentc9b19ac8928c6c9b7f25c3988177204f110d5e0e
Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'

* commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e':
  examples/transcode_aac: fix a typo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/examples/transcode_aac.c