Commit 5d88c264 authored by Ronald S. Bultje's avatar Ronald S. Bultje

Change audio_pkt_cnt from an array into a single field, since only a single

member of the array is ever used (compare to RMDemuxContext->audio_pkt_cnt).
See "[PATCH] oops I broke rdt.c" mailinglist thread.

Originally committed as revision 16367 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 886e89d0
...@@ -85,7 +85,7 @@ struct PayloadContext { ...@@ -85,7 +85,7 @@ struct PayloadContext {
uint8_t *mlti_data; uint8_t *mlti_data;
unsigned int mlti_data_size; unsigned int mlti_data_size;
char buffer[RTP_MAX_PACKET_LENGTH + FF_INPUT_BUFFER_PADDING_SIZE]; char buffer[RTP_MAX_PACKET_LENGTH + FF_INPUT_BUFFER_PADDING_SIZE];
int audio_pkt_cnt[MAX_STREAMS]; /**< remaining audio packets in rmdec */ int audio_pkt_cnt; /**< remaining audio packets in rmdec */
}; };
void void
...@@ -307,8 +307,8 @@ rdt_parse_packet (PayloadContext *rdt, AVStream *st, ...@@ -307,8 +307,8 @@ rdt_parse_packet (PayloadContext *rdt, AVStream *st,
pos = url_ftell(&pb); pos = url_ftell(&pb);
if (res < 0) if (res < 0)
return res; return res;
rdt->audio_pkt_cnt[st->id] = res; rdt->audio_pkt_cnt = res;
if (rdt->audio_pkt_cnt[st->id] > 0 && if (rdt->audio_pkt_cnt > 0 &&
st->codec->codec_id == CODEC_ID_AAC) { st->codec->codec_id == CODEC_ID_AAC) {
memcpy (rdt->buffer, buf + pos, len - pos); memcpy (rdt->buffer, buf + pos, len - pos);
rdt->rmctx->pb = av_alloc_put_byte (rdt->buffer, len - pos, 0, rdt->rmctx->pb = av_alloc_put_byte (rdt->buffer, len - pos, 0,
...@@ -316,14 +316,14 @@ rdt_parse_packet (PayloadContext *rdt, AVStream *st, ...@@ -316,14 +316,14 @@ rdt_parse_packet (PayloadContext *rdt, AVStream *st,
} }
} else { } else {
ff_rm_retrieve_cache (rdt->rmctx, rdt->rmctx->pb, st, rdt->rmst[0], pkt); ff_rm_retrieve_cache (rdt->rmctx, rdt->rmctx->pb, st, rdt->rmst[0], pkt);
if (rdt->audio_pkt_cnt[st->id] == 0 && if (rdt->audio_pkt_cnt == 0 &&
st->codec->codec_id == CODEC_ID_AAC) st->codec->codec_id == CODEC_ID_AAC)
av_freep(&rdt->rmctx->pb); av_freep(&rdt->rmctx->pb);
} }
pkt->stream_index = st->index; pkt->stream_index = st->index;
pkt->pts = *timestamp; pkt->pts = *timestamp;
return rdt->audio_pkt_cnt[st->id] > 0; return rdt->audio_pkt_cnt > 0;
} }
int int
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment