diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 03:13:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 03:13:16 +0100 |
| commit | f38e2bcb72ee2df60ce0fbeb2e33ce0ca8ebd7e8 (patch) | |
| tree | f5705f1f602bbd4ce4d8f0fc1d25e2da23c1bcda /libavformat/movenc.h | |
| parent | 504267fb56ba815ff896f9d5a7ce129a8ae674ab (diff) | |
| parent | 847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b (diff) | |
| download | ffmpeg-streaming-f38e2bcb72ee2df60ce0fbeb2e33ce0ca8ebd7e8.zip ffmpeg-streaming-f38e2bcb72ee2df60ce0fbeb2e33ce0ca8ebd7e8.tar.gz | |
Merge commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b'
* commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b':
movenc: Add an option for delaying writing the moov with empty_moov
Conflicts:
libavformat/movenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
| -rw-r--r-- | libavformat/movenc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 72ae6c9..79374af 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -201,6 +201,7 @@ typedef struct MOVMuxContext { #define FF_MOV_FLAG_DEFAULT_BASE_MOOF (1 << 10) #define FF_MOV_FLAG_DASH (1 << 11) #define FF_MOV_FLAG_FRAG_DISCONT (1 << 12) +#define FF_MOV_FLAG_DELAY_MOOV (1 << 13) int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt); |
