[FFmpeg-cvslog] Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 13:20:54 2015 +0100| [010311d67337419b218f0834b019821b08552127] | committer: Michael Niedermayer

Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=010311d67337419b218f0834b019821b08552127
---