diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2012-04-04 02:49:47 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-05 05:48:29 +0200 |
| commit | 1ceff0859df1c4f6bfacd6c1cd9dbdcceb039423 (patch) | |
| tree | 89afe0006e46d28afabf5786836c565a097c7f5f /libavformat/asfenc.c | |
| parent | 97d36a1898dabd6fd85d0f2295bdac911d607b8e (diff) | |
asfenc: rename some variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfenc.c')
| -rw-r--r-- | libavformat/asfenc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 136ddb325f..1e42e1c825 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -786,9 +786,9 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) { ASFContext *asf = s->priv_data; ASFStream *stream; - int64_t duration; AVCodecContext *codec; - int64_t packet_st,pts; + uint32_t packet_number; + int64_t pts; int start_sec,i; int flags= pkt->flags; @@ -800,15 +800,15 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts; assert(pts != AV_NOPTS_VALUE); - duration = pts * 10000; - asf->duration= FFMAX(asf->duration, duration + pkt->duration * 10000); + pts *= 10000; + asf->duration= FFMAX(asf->duration, pts + pkt->duration * 10000); - packet_st = asf->nb_packets; + packet_number = asf->nb_packets; put_frame(s, stream, s->streams[pkt->stream_index], pkt->dts, pkt->data, pkt->size, flags); /* check index */ if ((!asf->is_streamed) && (flags & AV_PKT_FLAG_KEY)) { - start_sec = (int)(duration / INT64_C(10000000)); + start_sec = (int)(pts / INT64_C(10000000)); if (start_sec != (int)(asf->last_indexed_pts / INT64_C(10000000))) { if (start_sec > asf->nb_index_memory_alloc) { asf->nb_index_memory_alloc = (start_sec + ASF_INDEX_BLOCK) & ~(ASF_INDEX_BLOCK - 1); @@ -816,12 +816,12 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) } for(i=asf->nb_index_count;i<start_sec;i++) { // store - asf->index_ptr[i].packet_number = (uint32_t)packet_st; - asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets-packet_st); - asf->maximum_packet = FFMAX(asf->maximum_packet, (uint16_t)(asf->nb_packets-packet_st)); + asf->index_ptr[i].packet_number = (uint32_t)packet_number; + asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets-packet_number); + asf->maximum_packet = FFMAX(asf->maximum_packet, (uint16_t)(asf->nb_packets-packet_number)); } asf->nb_index_count = start_sec; - asf->last_indexed_pts = duration; + asf->last_indexed_pts = pts; } } return 0; |