Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add an audio transcoding example.

Conflicts:
	configure
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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"

doc/Makefile

@@ -37,7 +37,8 @@ DOCS-$(CONFIG_TXTPAGES)  += $(TXTPAGES)
 DOCS = $(DOCS-yes)
 
 DOC_EXAMPLES-$(CONFIG_MUXING_EXAMPLE)           += muxing
-ALL_DOC_EXAMPLES = muxing
+DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE)    += transcode_aac
+ALL_DOC_EXAMPLES = muxing transcode_aac
 
 DOC_EXAMPLES     := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF))
 ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(PROGSSUF)$(EXESUF))