diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 21:50:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 21:55:46 +0100 |
| commit | 8c1c06937156fb8dba1f1266b985f8671c29f4e2 (patch) | |
| tree | 9df1100e69b52f6e0567c52e9cd64db9fd692cdb /libavformat/rtpdec.c | |
| parent | c6792275f43cdf1fc42f1cf4bd37c4595b048180 (diff) | |
| parent | 04a1be8e28e81f3967eace7705343c450616cc95 (diff) | |
Merge commit '04a1be8e28e81f3967eace7705343c450616cc95'
* commit '04a1be8e28e81f3967eace7705343c450616cc95':
libavformat: add T.140 RTP depacketization (RFC 4103)
Conflicts:
libavformat/rtpdec.c
libavformat/version.h
See: af940e6cb1212d4338e55c03498ef5ae40e6e749
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.c')
| -rw-r--r-- | libavformat/rtpdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index b4637e2c6f..b3511d1ba4 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -56,7 +56,7 @@ static RTPDynamicProtocolHandler opus_dynamic_handler = { .codec_id = AV_CODEC_ID_OPUS, }; -static RTPDynamicProtocolHandler ff_t140_dynamic_handler = { +static RTPDynamicProtocolHandler t140_dynamic_handler = { /* RFC 4103 */ .enc_name = "t140", .codec_type = AVMEDIA_TYPE_SUBTITLE, .codec_id = AV_CODEC_ID_SUBRIP, @@ -104,7 +104,6 @@ void ff_register_rtp_dynamic_payload_handlers(void) ff_register_dynamic_payload_handler(&ff_quicktime_rtp_aud_handler); ff_register_dynamic_payload_handler(&ff_quicktime_rtp_vid_handler); ff_register_dynamic_payload_handler(&ff_svq3_dynamic_handler); - ff_register_dynamic_payload_handler(&ff_t140_dynamic_handler); ff_register_dynamic_payload_handler(&ff_theora_dynamic_handler); ff_register_dynamic_payload_handler(&ff_vorbis_dynamic_handler); ff_register_dynamic_payload_handler(&ff_vp8_dynamic_handler); @@ -113,6 +112,7 @@ void ff_register_rtp_dynamic_payload_handlers(void) ff_register_dynamic_payload_handler(&opus_dynamic_handler); ff_register_dynamic_payload_handler(&realmedia_mp3_dynamic_handler); ff_register_dynamic_payload_handler(&speex_dynamic_handler); + ff_register_dynamic_payload_handler(&t140_dynamic_handler); } RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name, |