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/allformats.c | |
| parent | 5162af67f41214edacefe05d9723e4a6d9847900 (diff) | |
| parent | 8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a (diff) | |
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/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 81aab56c82..a55e209a9f 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -254,6 +254,7 @@ void av_register_all(void) REGISTER_DEMUXER (RSD, rsd); REGISTER_MUXDEMUX(RSO, rso); REGISTER_MUXDEMUX(RTP, rtp); + REGISTER_MUXER (RTP_MPEGTS, rtp_mpegts); REGISTER_MUXDEMUX(RTSP, rtsp); REGISTER_DEMUXER (SAMI, sami); REGISTER_MUXDEMUX(SAP, sap); |