Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'

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

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

diff --cc doc/examples/transcode_aac.c
index 6998aac,75dd1e2..1e0010d
--- 1/doc/examples/transcode_aac.c
--- 2/doc/examples/transcode_aac.c
+++ b/doc/examples/transcode_aac.c
@@@ -38,14 -37,12 +38,12 @@@
  #include "libavutil/frame.h"
  #include "libavutil/opt.h"
  
 -#include "libavresample/avresample.h"
 +#include "libswresample/swresample.h"
  
  /** The output bit rate in kbit/s */
- #define OUTPUT_BIT_RATE 48000
+ #define OUTPUT_BIT_RATE 96000
  /** The number of output channels */
  #define OUTPUT_CHANNELS 2
- /** The audio sample output format */
- #define OUTPUT_SAMPLE_FORMAT AV_SAMPLE_FMT_S16
  
  /**
   * Convert an error code into a text message.