diff options
Diffstat (limited to 'libavformat/rtpdec.c')
-rw-r--r-- | libavformat/rtpdec.c | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 7fa0a93c21..38bd333e9c 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -74,6 +74,8 @@ void av_register_rtp_dynamic_payload_handlers(void) ff_register_dynamic_payload_handler(&ff_jpeg_dynamic_handler); ff_register_dynamic_payload_handler(&ff_mp4a_latm_dynamic_handler); ff_register_dynamic_payload_handler(&ff_mp4v_es_dynamic_handler); + ff_register_dynamic_payload_handler(&ff_mpeg_audio_dynamic_handler); + ff_register_dynamic_payload_handler(&ff_mpeg_video_dynamic_handler); ff_register_dynamic_payload_handler(&ff_mpeg4_generic_dynamic_handler); ff_register_dynamic_payload_handler(&ff_mpegts_dynamic_handler); ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfv_handler); @@ -583,7 +585,7 @@ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestam static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt, const uint8_t *buf, int len) { - unsigned int ssrc, h; + unsigned int ssrc; int payload_type, seq, flags = 0; int ext; AVStream *st; @@ -645,42 +647,8 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt, } else if (st) { /* At this point, the RTP header has been stripped; * This is ASSUMING that there is only 1 CSRC, which isn't wise. */ - switch (st->codec->codec_id) { - case AV_CODEC_ID_MP2: - case AV_CODEC_ID_MP3: - /* better than nothing: skip MPEG audio RTP header */ - if (len <= 4) - return -1; - h = AV_RB32(buf); - len -= 4; - buf += 4; - av_new_packet(pkt, len); - memcpy(pkt->data, buf, len); - break; - case AV_CODEC_ID_MPEG1VIDEO: - case AV_CODEC_ID_MPEG2VIDEO: - /* better than nothing: skip MPEG video RTP header */ - if (len <= 4) - return -1; - h = AV_RB32(buf); - buf += 4; - len -= 4; - if (h & (1 << 26)) { - /* MPEG-2 */ - if (len <= 4) - return -1; - buf += 4; - len -= 4; - } - av_new_packet(pkt, len); - memcpy(pkt->data, buf, len); - break; - default: - av_new_packet(pkt, len); - memcpy(pkt->data, buf, len); - break; - } - + av_new_packet(pkt, len); + memcpy(pkt->data, buf, len); pkt->stream_index = st->index; } else { return AVERROR(EINVAL); |