* commit '5e5583efe41662294c5e1b76499ba338557f808d': libavformat: add AC3 RTP depacketization (RFC 4184) Conflicts: Changelog libavformat/rtpdec_ac3.c libavformat/version.h See: 3eec775b211c5fd00300e2042ae8f116293e5d55 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Reviewed-by: Thomas Volkert <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>