AVPacket cur_audio_pkt;
- int have_attachments;
+ unsigned nb_attachments;
int have_video;
int reserve_cues_space;
AVDictionaryEntry *tag;
if (par->codec_type == AVMEDIA_TYPE_ATTACHMENT) {
- mkv->have_attachments = 1;
return 0;
}
AVIOContext *pb = s->pb;
int i, ret, default_stream_exists = 0;
+ if (mkv->nb_attachments == s->nb_streams)
+ return 0;
+
mkv_add_seekhead_entry(mkv, MATROSKA_ID_TRACKS, avio_tell(pb));
ret = start_ebml_master_crc32(&mkv->tracks_bc, mkv);
}
}
- if (mkv->have_attachments && mkv->mode != MODE_WEBM) {
+ if (mkv->nb_attachments && mkv->mode != MODE_WEBM) {
for (i = 0; i < s->nb_streams; i++) {
mkv_track *track = &mkv->tracks[i];
AVStream *st = s->streams[i];
AVIOContext *dyn_cp = NULL, *pb = s->pb;
int i, ret;
- if (!mkv->have_attachments)
+ if (!mkv->nb_attachments)
return 0;
mkv_add_seekhead_entry(mkv, MATROSKA_ID_ATTACHMENTS, avio_tell(pb));
put_ebml_float(mkv->info_bc, MATROSKA_ID_DURATION, mkv->duration);
end_ebml_master_crc32(pb, &mkv->info_bc, mkv, MATROSKA_ID_INFO, 0, 0);
- // write tracks master
- avio_seek(pb, mkv->tracks_pos, SEEK_SET);
- end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, MATROSKA_ID_TRACKS, 0, 0);
+ if (mkv->tracks_bc) {
+ // write Tracks master
+ avio_seek(pb, mkv->tracks_pos, SEEK_SET);
+ end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv,
+ MATROSKA_ID_TRACKS, 0, 0);
+ }
// update stream durations
if (mkv->tags_bc) {
av_log(s, AV_LOG_WARNING, "Stream %d will be ignored "
"as WebM doesn't support attachments.\n", i);
}
+ mkv->nb_attachments++;
continue;
}