diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-31 01:46:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-31 01:46:25 +0100 |
| commit | 8065a0cdbed7c909bdbdd4708368e6096db3752b (patch) | |
| tree | 6fa0ae72b886cd9bbe32c23fc2c9a984b865608d /libavformat/movenc.h | |
| parent | f76cd09d466efffdb51b418ce2ce34c7a7e6d342 (diff) | |
| parent | cf589faa5b7aed3bb38e08dcd00bd951e69686d1 (diff) | |
| download | ffmpeg-8065a0cdbed7c909bdbdd4708368e6096db3752b.tar.gz | |
Merge commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1'
* commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1':
movenc: Add a flag for using default-base-is-moof in tfhd atoms
Conflicts:
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 c9faee6acd..cadb449368 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -195,6 +195,7 @@ typedef struct MOVMuxContext { #define FF_MOV_FLAG_FASTSTART 128 #define FF_MOV_FLAG_OMIT_TFHD_OFFSET 256 #define FF_MOV_FLAG_DISABLE_CHPL 512 +#define FF_MOV_FLAG_DEFAULT_BASE_MOOF 1024 int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt); |