Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 09:30:37 +0000 (10:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 09:31:08 +0000 (10:31 +0100)
commit715f3623f8cd16c9e8d704bad45b76aa30d31cd2
treed69db24220cb75d3e77561453e0c21cf8ff783a2
parent3aaa50a9972c9f350ad9ce6decf3ecb2aaffa84a
parent10421bcf0ab5d48fa3d84de803e657b77fe7d3c0
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
doc/Makefile
doc/examples/transcode_aac.c