Merge commit '96084251e57d1738fde02a2b0d37ca609d9efd71'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 00:18:18 +0000 (01:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 00:30:17 +0000 (01:30 +0100)
commit1186e7cf95dd097f89ff2fc390bf23f678f6cc54
tree2a42fe6428aeed2b41a4fd5776f2d3c5d25658ea
parentdedbefee60430e04551977553838e89dad4ff932
parent96084251e57d1738fde02a2b0d37ca609d9efd71
Merge commit '96084251e57d1738fde02a2b0d37ca609d9efd71'

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

Conflicts:
Changelog
libavformat/version.h

See: 22470510d1f9441e848bbe107c7963b6d492b47f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/Makefile
libavformat/rtpdec_mpa_robust.c
libavformat/rtpdec_mpeg12.c
libavformat/version.h