aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-30 02:36:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-10-30 02:37:03 +0100
commitad600e10da6beaa057ae16fdb12c94414dd6c20e (patch)
treece07e936bdfd89f5c3c74c8c421645b0884ad42e
parent39cce77faf156644681b9816b66c36b85a33c575 (diff)
parent1e0b81abe86dc09dd34d60d57f92de5f12d65818 (diff)
downloadffmpeg-ad600e10da6beaa057ae16fdb12c94414dd6c20e.tar.gz
Merge commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818'
* commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818': movenc: Use a local variable consistently Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/movenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index ba3c90453d..96f51547c0 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -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");
res = shift_data(s);
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);
}
} else if (mov->reserved_moov_size > 0) {