* commit '96084251':
  libavformat: add robust MPEG audio depacketization (RFC 5219)

Conflicts:
	Changelog
	libavformat/version.h

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