generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtpdec: Simplify finalize_packet

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
John Brooks 2011-11-09 16:28:35 -07:00 committed by Martin Storsjö
parent b911518d1c
commit b8a1b880ee
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/rtpdec.c
View File

@ -421,7 +421,10 @@ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestam
{ {
if (pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE) if (pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE)
return; /* Timestamp already set by depacketizer */ return; /* Timestamp already set by depacketizer */
if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE && timestamp != RTP_NOTS_VALUE) { if (timestamp == RTP_NOTS_VALUE)
return;
if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) {
int64_t addend; int64_t addend;
int delta_timestamp; int delta_timestamp;
@ -433,8 +436,7 @@ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestam
delta_timestamp; delta_timestamp;
return; return;
} }
if (timestamp == RTP_NOTS_VALUE)
return;
if (!s->base_timestamp) if (!s->base_timestamp)
s->base_timestamp = timestamp; s->base_timestamp = timestamp;
pkt->pts = s->range_start_offset + timestamp - s->base_timestamp; pkt->pts = s->range_start_offset + timestamp - s->base_timestamp;