Michael Niedermayer
|
1186e7cf95
|
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>
|
2015-02-22 01:30:17 +01:00 |
|