[FFmpeg-cvslog] avformat/movenc: Fix mix of declaration and statement

Michael Niedermayer git at videolan.org
Wed Apr 12 00:38:57 EEST 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Apr 11 23:22:19 2017 +0200| [6268f2ca7b9a943423ca8a48886547d30b6de393] | committer: Michael Niedermayer

avformat/movenc: Fix mix of declaration and statement

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/movenc.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index f511924fd7..e6a70bffc0 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2243,6 +2243,7 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track)
     struct sgpd_entry *sgpd_entries = NULL;
     int entries = -1;
     int group = 0;
+    int i, j;
 
     const int OPUS_SEEK_PREROLL_MS = 80;
     int roll_samples = av_rescale_q(OPUS_SEEK_PREROLL_MS,
@@ -2257,10 +2258,10 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track)
 
     av_assert0(track->par->codec_id == AV_CODEC_ID_OPUS);
 
-    for (int i = 0; i < track->entry; i++) {
+    for (i = 0; i < track->entry; i++) {
         int roll_samples_remaining = roll_samples;
         int distance = 0;
-        for (int j = i - 1; j >= 0; j--) {
+        for (j = i - 1; j >= 0; j--) {
             roll_samples_remaining -= get_cluster_duration(track, j);
             distance++;
             if (roll_samples_remaining <= 0)
@@ -2295,7 +2296,7 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track)
     ffio_wfourcc(pb, "roll");
     avio_wb32(pb, 2); /* default_length */
     avio_wb32(pb, group); /* entry_count */
-    for (int i = 0; i < entries; i++) {
+    for (i = 0; i < entries; i++) {
         if (sgpd_entries[i].group_description_index) {
             avio_wb16(pb, -sgpd_entries[i].roll_distance); /* roll_distance */
         }
@@ -2307,7 +2308,7 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track)
     avio_wb32(pb, 0); /* fullbox */
     ffio_wfourcc(pb, "roll");
     avio_wb32(pb, entries); /* entry_count */
-    for (int i = 0; i < entries; i++) {
+    for (i = 0; i < entries; i++) {
         avio_wb32(pb, sgpd_entries[i].count); /* sample_count */
         avio_wb32(pb, sgpd_entries[i].group_description_index); /* group_description_index */
     }



More information about the ffmpeg-cvslog mailing list