summaryrefslogtreecommitdiff
path: root/libavformat/isom.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-23 13:16:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-23 13:27:34 +0200
commitc6f4a3a70837cf259466a7aab440dc0682b08c72 (patch)
tree402abdc162ff286c32037edb1fa7db0b5489226b /libavformat/isom.h
parentdd1d29bd5f313e916eb276da1eb2d1e703e80e8f (diff)
parent1f70a5ad284b33e8b3e2b40a5cb33055419781b7 (diff)
Merge commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7'
* commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7': mov: use tkhd enabled flag to set the default track Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.h')
-rw-r--r--libavformat/isom.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h
index b0fa453de6..828e5005ad 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -202,6 +202,11 @@ void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id);
#define MOV_FRAG_SAMPLE_FLAG_DEPENDS_NO 0x02000000
#define MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES 0x01000000
+#define MOV_TKHD_FLAG_ENABLED 0x0001
+#define MOV_TKHD_FLAG_IN_MOVIE 0x0002
+#define MOV_TKHD_FLAG_IN_PREVIEW 0x0004
+#define MOV_TKHD_FLAG_IN_POSTER 0x0008
+
int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom);
enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags);