[FFmpeg-cvslog] asfenc: reduce code duplication with new variable

Ramiro Polla git at videolan.org
Wed Sep 12 16:50:37 CEST 2012


ffmpeg | branch: release/0.10 | Ramiro Polla <ramiro.polla at gmail.com> | Wed Apr  4 02:50:05 2012 -0300| [b04fbd2cd250f1c9fdaeb47275d71d6df3ee457d] | committer: Michael Niedermayer

asfenc: reduce code duplication with new variable

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f2fad251b8f0b5cfa9fa43200e72f5f9194fd620)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b04fbd2cd250f1c9fdaeb47275d71d6df3ee457d
---

 libavformat/asfenc.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index 1e42e1c..d1bb07b 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -808,6 +808,7 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
 
     /* check index */
     if ((!asf->is_streamed) && (flags & AV_PKT_FLAG_KEY)) {
+        uint16_t packet_count = asf->nb_packets - packet_number;
         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) {
@@ -817,8 +818,8 @@ 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_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->index_ptr[i].packet_count  = (uint16_t)packet_count;
+                asf->maximum_packet = FFMAX(asf->maximum_packet, (uint16_t)packet_count);
             }
             asf->nb_index_count = start_sec;
             asf->last_indexed_pts = pts;



More information about the ffmpeg-cvslog mailing list