diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 02:49:36 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 02:49:36 +0100 |
commit | 7ef515cda5fdfa5800a9336a128bff1f1b85edea (patch) | |
tree | 8605cdbc9924dfc7711e00910c731ca8a7d9837a /libavformat/Makefile | |
parent | 5162af67f41214edacefe05d9723e4a6d9847900 (diff) | |
parent | 8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a (diff) | |
download | ffmpeg-streaming-7ef515cda5fdfa5800a9336a128bff1f1b85edea.zip ffmpeg-streaming-7ef515cda5fdfa5800a9336a128bff1f1b85edea.tar.gz |
Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'
* commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a':
libavformat: Add a muxer wrapping mpegts encoding into RTP
Conflicts:
Changelog
libavformat/version.h
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 6bf0761..7e4beac 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -363,6 +363,7 @@ OBJS-$(CONFIG_RSD_DEMUXER) += rsd.o OBJS-$(CONFIG_RSO_DEMUXER) += rsodec.o rso.o pcm.o OBJS-$(CONFIG_RSO_MUXER) += rsoenc.o rso.o OBJS-$(CONFIG_RPL_DEMUXER) += rpl.o +OBJS-$(CONFIG_RTP_MPEGTS_MUXER) += rtpenc_mpegts.o OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_aac.o \ rtpenc_latm.o \ |