This reverts commit 0cc81ef4.

This reverts commit ee32050e.

Use the number of channels if physical channel config is not set

Conflicts:

	extras/contrib/src/Makefile     : rpm build, faad2 and x264
	modules/codec/faad.c		: CPUCapabilities()
	modules/codec/ffmpeg/encoder.c	: aac-profile and sample_rate fix
	src/misc/charset.c		: id-madness

When specifying --sout-transcode-samplerate and --sout-transcode-channel, set the OUTPUT format instead of the INPUT

Fix resampling when using mp4a (faac is the only option atm)

This reverts commit 379faf5d.

Accidentally committed a moved file

Backported from 7b76e347

(cherry picked from commit 7b76e347)

Conflicts:

	src/text/charset.c

Patch by Bertrand Marquis aka bma on Launchpad (LP#104698)
Refs #986

There is no need to copy the files in that case thanks to VPATH.
That assumes you are using a source tarball then - if not, you are
screwed anywhow.
(cherry picked from commit 16402c26)

This reverts commit 70f620e7.
(cherry picked from commit 5badb86c)

Fix make distcheck

(cherry picked from commit 4f815159)

(cherry picked from commit c432ea06)

(needs to check make distclean now)
(cherry picked from commit ce52ce2e)

(cherrypicked from a24214d3)

Conflicts:

	extras/contrib/bootstrap
	extras/contrib/src/Makefile
	extras/contrib/src/packages.mak
	modules/codec/faad.c

(cherry picked from commit 57bfc6e6)

doc: update the release howto for git. (cherry-picked from 774de705 and merged).

Add ADTS headers on top of the raw AAC frames
Use the ADTS stream type (0x0f) since LOAS isn't implemented
    This was wrong since we were streaming raw, not LOAS/LATM
(cherry picked from commit 805a9ad6)

(cherry picked from commit d9023722)