diff options
| -rw-r--r-- | libavformat/rdt.c | 2 | ||||
| -rw-r--r-- | libavformat/rm.h | 7 | ||||
| -rw-r--r-- | libavformat/rmdec.c | 20 |
3 files changed, 14 insertions, 15 deletions
diff --git a/libavformat/rdt.c b/libavformat/rdt.c index b1dd93918e..24ee6a993d 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -308,7 +308,7 @@ rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st, init_put_byte(&pb, buf, len, 0, NULL, NULL, NULL, NULL); flags = (flags & RTP_FLAG_KEY) ? 2 : 0; res = ff_rm_parse_packet (rdt->rmctx, &pb, st, rdt->rmst[st->index], len, pkt, - &seq, &flags, timestamp); + &seq, flags, *timestamp); pos = url_ftell(&pb); if (res < 0) return res; diff --git a/libavformat/rm.h b/libavformat/rm.h index 8bb32bf701..a60004883a 100644 --- a/libavformat/rm.h +++ b/libavformat/rm.h @@ -61,16 +61,15 @@ int ff_rm_read_mdpr_codecdata (AVFormatContext *s, ByteIOContext *pb, * @param pkt packet location to store the parsed packet data * @param seq pointer to an integer containing the sequence number, may be * updated - * @param flags pointer to an integer containing the packet flags, may be - updated - * @param ts pointer to timestamp, may be updated + * @param flags the packet flags + * @param ts timestamp of the current packet * @return <0 on error, 0 if a packet was placed in the pkt pointer. A * value >0 means that no data was placed in pkt, but that cached * data is available by calling ff_rm_retrieve_cache(). */ int ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb, AVStream *st, RMStream *rst, int len, - AVPacket *pkt, int *seq, int *flags, int64_t *ts); + AVPacket *pkt, int *seq, int flags, int64_t ts); /** * Retrieve one cached packet from the rm-context. The real container can diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 0c133246f3..f3c3019dec 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -689,7 +689,7 @@ rm_reorder_sipr_data (RMStream *ast) int ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb, AVStream *st, RMStream *ast, int len, AVPacket *pkt, - int *seq, int *flags, int64_t *timestamp) + int *seq, int flags, int64_t timestamp) { RMDemuxContext *rm = s->priv_data; @@ -709,10 +709,10 @@ ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb, int y = ast->sub_packet_cnt; int w = ast->audio_framesize; - if (*flags & 2) + if (flags & 2) y = ast->sub_packet_cnt = 0; if (!y) - ast->audiotimestamp = *timestamp; + ast->audiotimestamp = timestamp; switch(st->codec->codec_id) { case CODEC_ID_RA_288: @@ -745,7 +745,7 @@ ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb, for (x = 0; x < ast->sub_packet_cnt; x++) ast->sub_packet_lengths[x] = get_be16(pb); rm->audio_pkt_cnt = ast->sub_packet_cnt; - ast->audiotimestamp = *timestamp; + ast->audiotimestamp = timestamp; } else return -1; } else { @@ -763,15 +763,15 @@ ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb, int seq= 128*(pkt->data[2]&0x7F) + (pkt->data[3]>>1); av_log(s, AV_LOG_DEBUG, "%d %"PRId64" %d\n", *timestamp, *timestamp*512LL/25, seq); - seq |= (*timestamp&~0x3FFF); - if(seq - *timestamp > 0x2000) seq -= 0x4000; - if(seq - *timestamp < -0x2000) seq += 0x4000; + seq |= (timestamp&~0x3FFF); + if(seq - timestamp > 0x2000) seq -= 0x4000; + if(seq - timestamp < -0x2000) seq += 0x4000; } } #endif - pkt->pts= *timestamp; - if (*flags & 2) + pkt->pts= timestamp; + if (flags & 2) pkt->flags |= PKT_FLAG_KEY; return st->codec->codec_type == CODEC_TYPE_AUDIO ? rm->audio_pkt_cnt : 0; @@ -838,7 +838,7 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt) old_flags = flags; res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt, - &seq, &flags, ×tamp); + &seq, flags, timestamp); if((old_flags&2) && (seq&0x7F) == 1) av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME); if (res) |