diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 12:41:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 12:41:57 +0200 |
| commit | 4c91599484e115e9b51c884fc46cea3f8511f8ae (patch) | |
| tree | 9ca391deefa9c064825e57daa2b3b9868969d5c4 /libavformat/movenc.h | |
| parent | e1f4397e74f0a21c10e74eabb87f6fe601d6791f (diff) | |
| parent | f90729699db9ede2bef2b28000f1795dab1b8996 (diff) | |
Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'
* commit 'f90729699db9ede2bef2b28000f1795dab1b8996':
mov: Do not group tracks if more than one is enabled per type
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
| -rw-r--r-- | libavformat/movenc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index be0a851d12..04cb1f392a 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -176,6 +176,8 @@ typedef struct MOVMuxContext { int64_t reserved_moov_pos; char *major_brand; + + int per_stream_grouping; } MOVMuxContext; #define FF_MOV_FLAG_RTP_HINT 1 |