Commit ad600e10 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1e0b81ab'

* commit '1e0b81ab':
  movenc: Use a local variable consistently
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 39cce77f 1e0b81ab
...@@ -4816,7 +4816,7 @@ static int mov_write_trailer(AVFormatContext *s) ...@@ -4816,7 +4816,7 @@ static int mov_write_trailer(AVFormatContext *s)
av_log(s, AV_LOG_INFO, "Starting second pass: moving the moov atom to the beginning of the file\n"); av_log(s, AV_LOG_INFO, "Starting second pass: moving the moov atom to the beginning of the file\n");
res = shift_data(s); res = shift_data(s);
if (res == 0) { if (res == 0) {
avio_seek(s->pb, mov->reserved_moov_pos, SEEK_SET); avio_seek(pb, mov->reserved_moov_pos, SEEK_SET);
mov_write_moov_tag(pb, mov, s); mov_write_moov_tag(pb, mov, s);
} }
} else if (mov->reserved_moov_size > 0) { } else if (mov->reserved_moov_size > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment