Merge commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818'
* commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818': movenc: Use a local variable consistently Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ad600e10da
@ -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) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user