Conflicts:

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

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)

(cherry picked from commit e91f2120)

(cherry picked from commit be3c7a5f)

(cherry picked from commit cf34ca7b)

(cherry picked from commit 96fca586)

Do not allocate ridiculous amount of datas.
Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>
(cherry picked from commit ab4e8a39)

Update contrib to a newer faad2 version, which is used in 0.9.0 (fixes various problems with older libfaad library).

(manually backported from 39237808)

(cherry picked from commit d6271bf0)

Some MP4-knowledgeable dev (fenrir?) really should check that this is
not too restrictive a check.

reported by Drew Yao
(cherry picked from commit 897a57e0e95f393e81f3ae6def526bf002f766df)