Merge commit '5e5583efe41662294c5e1b76499ba338557f808d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 23:46:22 +0000 (00:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 23:48:27 +0000 (00:48 +0100)
commit17384b1719807b42943bc8e481133d34fb05d9a5
treea99df30eb2e9aced570bab58b18d818f2f9931e1
parent285eea00013f774cc935137a2e73a8f6ffb4e236
parent5e5583efe41662294c5e1b76499ba338557f808d
Merge commit '5e5583efe41662294c5e1b76499ba338557f808d'

* 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>
Changelog
libavformat/rtpdec_ac3.c
libavformat/version.h