diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-18 08:50:22 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-18 08:50:22 +0200 |
| commit | 1907e19d0ce2ad752912d73b798ebf4494aa1b1c (patch) | |
| tree | 7ce15d4eb18d5d382a065f3bd815d04f06897018 /libavformat/movenc.h | |
| parent | 737aa902f069ed218fd2d13c59015391facf73c8 (diff) | |
| parent | 26ac22e5e7394346e9d59f800e7d4e91f4518d33 (diff) | |
| download | ffmpeg-1907e19d0ce2ad752912d73b798ebf4494aa1b1c.tar.gz | |
Merge commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33'
* commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33':
movenc: Add a new flag for writing global sidx indexes for dash
Conflicts:
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
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 72862f1b10..06adf2b121 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -209,8 +209,9 @@ typedef struct MOVMuxContext { #define FF_MOV_FLAG_DASH (1 << 11) #define FF_MOV_FLAG_FRAG_DISCONT (1 << 12) #define FF_MOV_FLAG_DELAY_MOOV (1 << 13) -#define FF_MOV_FLAG_WRITE_COLR (1 << 14) -#define FF_MOV_FLAG_WRITE_GAMA (1 << 15) +#define FF_MOV_FLAG_GLOBAL_SIDX (1 << 14) +#define FF_MOV_FLAG_WRITE_COLR (1 << 15) +#define FF_MOV_FLAG_WRITE_GAMA (1 << 16) int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt); |