[SCM] libav/experimental: Move AVStream->codec_info_nb_frames increment after try_decode_frame

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:10:12 UTC 2013


The following commit has been merged in the experimental branch:
commit 9d3fdf2031403301f25d7f5b4f5c323ba95139ee
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sat Jul 3 03:15:37 2010 +0000

    Move AVStream->codec_info_nb_frames increment after try_decode_frame
    
    Originally committed as revision 24017 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 0504291..6fa4dff 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2281,8 +2281,6 @@ int av_find_stream_info(AVFormatContext *ic)
             }
             codec_info_duration[st->index] += pkt->duration;
         }
-            st->codec_info_nb_frames++;
-
         {
             int index= pkt->stream_index;
             int64_t last= last_dts[index];
@@ -2326,6 +2324,7 @@ int av_find_stream_info(AVFormatContext *ic)
         if (!has_codec_parameters(st->codec) || !has_decode_delay_been_guessed(st))
             try_decode_frame(st, pkt);
 
+        st->codec_info_nb_frames++;
         count++;
     }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list