summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-17 21:21:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-17 21:22:47 +0100
commitb96c1cd78b85ad53c44bca0ef16858be95593c79 (patch)
treeb3f17e09396295b6e41eb133dc162982ecf1391d /libavformat/movenc.c
parent894d10332ca527ef91b29ad6eb52b73bdc95eb22 (diff)
parent0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6 (diff)
Merge commit '0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6'
* commit '0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6': movenc: Include empty tracks in iods when writing fragmented mp4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 8208e74c35..7133cf4e4e 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2427,7 +2427,7 @@ static int mov_write_iods_tag(AVIOContext *pb, MOVMuxContext *mov)
int audio_profile = mov->iods_audio_profile;
int video_profile = mov->iods_video_profile;
for (i = 0; i < mov->nb_streams; i++) {
- if (mov->tracks[i].entry > 0) {
+ if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {
has_audio |= mov->tracks[i].enc->codec_type == AVMEDIA_TYPE_AUDIO;
has_video |= mov->tracks[i].enc->codec_type == AVMEDIA_TYPE_VIDEO;
}