diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 01:18:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 01:30:17 +0100 |
| commit | 1186e7cf95dd097f89ff2fc390bf23f678f6cc54 (patch) | |
| tree | 2a42fe6428aeed2b41a4fd5776f2d3c5d25658ea /libavformat/Makefile | |
| parent | dedbefee60430e04551977553838e89dad4ff932 (diff) | |
| parent | 96084251e57d1738fde02a2b0d37ca609d9efd71 (diff) | |
| download | ffmpeg-1186e7cf95dd097f89ff2fc390bf23f678f6cc54.tar.gz | |
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>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 94a30fd80b..61a7a81e94 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -42,6 +42,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtpdec_ilbc.o \ rtpdec_jpeg.o \ rtpdec_latm.o \ + rtpdec_mpa_robust.o \ rtpdec_mpeg12.o \ rtpdec_mpeg4.o \ rtpdec_mpegts.o \ |