diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-10 11:23:21 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-10 11:23:21 +0200 |
| commit | 7653ebfff6ea3f91ea81599ba8e2af922c510ecb (patch) | |
| tree | 9f3e055049800aa8e1b053b61083e66937a0a6e8 /libavformat/movenc.h | |
| parent | 6c52432b4812acd68c2b93cdc367828cb73b68a4 (diff) | |
| parent | 83f254e65f938657a4dbec711e4c94252a72daf9 (diff) | |
| download | ffmpeg-7653ebfff6ea3f91ea81599ba8e2af922c510ecb.tar.gz | |
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>
Diffstat (limited to 'libavformat/movenc.h')
| -rw-r--r-- | libavformat/movenc.h | 2 |
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; |