Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add an audio transcoding example.

Conflicts:
	configure
	doc/Makefile

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

1 files changed, 2 insertions, 0 deletions

diff --git a/configure b/configure
index f2533b4e5e..4a86c36319 100755
--- a/configure
+++ b/configure
@@ -1166,6 +1166,7 @@ COMPONENT_LIST="
 
 EXAMPLE_LIST="
     muxing_example
+    transcode_aac_example
 "
 
 EXTERNAL_LIBRARY_LIST="
@@ -2276,6 +2277,7 @@ zmq_filter_deps="libzmq"
 
 # examples
 muxing_example_deps="avcodec avformat avutil swscale"
+transcode_aac_example_deps="avcodec avformat avresample"
 
 # libraries
 avcodec_deps="avutil"