RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'd0fe217e3990b003b3b3f2c2daaadfb2af590def' 

* commit 'd0fe217e3990b003b3b3f2c2daaadfb2af590def':
  rtpdec: Simplify insertion into the linked list queue
  rtpdec: Remove a woefully misplaced comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-15 14:34:23 +01:00
parent f6badba185 d0fe217e39
commit eaf1f01169
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/rtpdec.c
View File

@ -50,7 +50,6 @@ static RTPDynamicProtocolHandler opus_dynamic_handler = {
.codec_id = AV_CODEC_ID_OPUS,
};
/* statistics functions */
static RTPDynamicProtocolHandler *rtp_first_dynamic_payload_handler = NULL;
void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler)
@ -727,15 +726,14 @@ void ff_rtp_reset_packet_queue(RTPDemuxContext *s)
static void enqueue_packet(RTPDemuxContext *s, uint8_t *buf, int len)
{
uint16_t seq = AV_RB16(buf + 2);
RTPPacket *cur = s->queue, *prev = NULL, *packet;
RTPPacket **cur = &s->queue, *packet;
/* Find the correct place in the queue to insert the packet */
while (cur) {
int16_t diff = seq - cur->seq;
while (*cur) {
int16_t diff = seq - (*cur)->seq;
if (diff < 0)
break;
prev = cur;
cur = cur->next;
cur = &(*cur)->next;
}
packet = av_mallocz(sizeof(*packet));
@ -745,11 +743,8 @@ static void enqueue_packet(RTPDemuxContext *s, uint8_t *buf, int len)
packet->seq = seq;
packet->len = len;
packet->buf = buf;
packet->next = cur;
if (prev)
prev->next = packet;
else
s->queue = packet;
packet->next = *cur;
*cur = packet;
s->queue_len++;
}