aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/movenc.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-17 21:55:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-17 21:55:23 +0100
commit9e0b0c60bd7fa4d4a476b93f94436a8e37d98983 (patch)
treee0e8de2fab123d2e0c39f45ba42351442d1cc049 /libavformat/movenc.h
parent1fddfaa282ff63dba4170ced30f96dbb48bd0246 (diff)
parent2ded57371abead879bcee56da5131e5fac0d17ef (diff)
downloadffmpeg-9e0b0c60bd7fa4d4a476b93f94436a8e37d98983.tar.gz
Merge commit '2ded57371abead879bcee56da5131e5fac0d17ef'
* commit '2ded57371abead879bcee56da5131e5fac0d17ef': movenc: Add support for writing sidx atoms for DASH segments Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
-rw-r--r--libavformat/movenc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index 502572a73b..19ff7ede4f 100644
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -196,6 +196,7 @@ typedef struct MOVMuxContext {
#define FF_MOV_FLAG_OMIT_TFHD_OFFSET (1 << 8)
#define FF_MOV_FLAG_DISABLE_CHPL (1 << 9)
#define FF_MOV_FLAG_DEFAULT_BASE_MOOF (1 << 10)
+#define FF_MOV_FLAG_DASH (1 << 11)
int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt);