diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 13:37:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 13:37:16 +0200 |
| commit | d68adbd666cbc1180380034324d86cb31f1f77ae (patch) | |
| tree | 15d9f11e9e9f3fb6ec6c9a15a5d9848e379364ed /libavformat/movenc.h | |
| parent | 221a99aae767961c7567dc222f74b778581c9458 (diff) | |
| parent | f8ef91ff3d6bb83d601d816ef9368f911021c64b (diff) | |
| download | ffmpeg-d68adbd666cbc1180380034324d86cb31f1f77ae.tar.gz | |
Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'
* commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b':
movenc: add faststart option for web streaming
Conflicts:
doc/muxers.texi
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
| -rw-r--r-- | libavformat/movenc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index a6571d5109..79d8fa2d21 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -156,8 +156,6 @@ typedef struct MOVMuxContext { int flags; int rtp_flags; - int reserved_moov_size; ///< 0 for disabled, -1 for automatic, size otherwise - int64_t reserved_moov_pos; int iods_skip; int iods_video_profile; @@ -172,6 +170,9 @@ typedef struct MOVMuxContext { int use_editlist; int video_track_timescale; + + int reserved_moov_size; ///< 0 for disabled, -1 for automatic, size otherwise + int64_t reserved_moov_pos; } MOVMuxContext; #define FF_MOV_FLAG_RTP_HINT 1 |