diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:22:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:22:20 +0100 |
| commit | 802e5fc8f811fb0e1f23d3e12841d3134d67202e (patch) | |
| tree | 65e9b0550047155ed3a1e0069b8c7f0953ceb5a9 /libavformat/movenc.h | |
| parent | fc567ac49e17151f00f31b59030cd10f952612ef (diff) | |
| parent | 1e9db41e2a2166be5671b088ef4ad06a40af459f (diff) | |
| download | ffmpeg-802e5fc8f811fb0e1f23d3e12841d3134d67202e.tar.gz | |
Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'
* commit '1e9db41e2a2166be5671b088ef4ad06a40af459f':
movenc: Allow override of major brand in ftyp atom
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 81b2613230..fce2d3c932 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -174,6 +174,8 @@ typedef struct MOVMuxContext { int reserved_moov_size; ///< 0 for disabled, -1 for automatic, size otherwise int64_t reserved_moov_pos; + + char *major_brand; } MOVMuxContext; #define FF_MOV_FLAG_RTP_HINT 1 |