Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/movenc: Fix mix of declaration and statement

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/254/merge
Michael Niedermayer 8 years ago
parent 7b3cb953f7
commit 6268f2ca7b
1 changed files with 5 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      libavformat/movenc.c

9
libavformat/movenc.c
Unescape View File

@ -2243,6 +2243,7 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track)
struct sgpd_entry *sgpd_entries = NULL; struct sgpd_entry *sgpd_entries = NULL;
int entries = -1; int entries = -1;
int group = 0; int group = 0;
int i, j;
const int OPUS_SEEK_PREROLL_MS = 80; const int OPUS_SEEK_PREROLL_MS = 80;
int roll_samples = av_rescale_q(OPUS_SEEK_PREROLL_MS, 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); 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 roll_samples_remaining = roll_samples;
int distance = 0; 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); roll_samples_remaining -= get_cluster_duration(track, j);
distance++; distance++;
if (roll_samples_remaining <= 0) if (roll_samples_remaining <= 0)
@ -2295,7 +2296,7 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track)
ffio_wfourcc(pb, "roll"); ffio_wfourcc(pb, "roll");
avio_wb32(pb, 2); /* default_length */ avio_wb32(pb, 2); /* default_length */
avio_wb32(pb, group); /* entry_count */ 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) { if (sgpd_entries[i].group_description_index) {
avio_wb16(pb, -sgpd_entries[i].roll_distance); /* roll_distance */ 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 */ avio_wb32(pb, 0); /* fullbox */
ffio_wfourcc(pb, "roll"); ffio_wfourcc(pb, "roll");
avio_wb32(pb, entries); /* entry_count */ 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].count); /* sample_count */
avio_wb32(pb, sgpd_entries[i].group_description_index); /* group_description_index */ avio_wb32(pb, sgpd_entries[i].group_description_index); /* group_description_index */
} }

Write Preview
Loading…
Cancel
Save