Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9'

* commit '83f254e65f938657a4dbec711e4c94252a72daf9':
  movenc: Rename reserved_moov_pos to reserved_header_pos

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index 75d7782a6d..72862f1b10 100644
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -181,7 +181,7 @@ typedef struct MOVMuxContext {
     int video_track_timescale;
 
     int reserved_moov_size; ///< 0 for disabled, -1 for automatic, size otherwise
-    int64_t reserved_moov_pos;
+    int64_t reserved_header_pos;
 
     char *major_brand;