Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 12:20:54 +0000 (13:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 12:21:02 +0000 (13:21 +0100)
commit010311d67337419b218f0834b019821b08552127
tree6f3daedd52d146ccace63070686b03f36e111896
parenta7fa1b9aa104491e44a0489e09febe036c70f4f9
parent749a89d1b8bb73b4d4f14c48f33259a1300c1761
Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'

* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761':
  examples/transcode_aac: properly select the output sample format

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