@@ -1467,7 +1467,7 @@ static int mkv_write_tags(AVFormatContext *s)
static int mkv_write_attachments(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
- AVIOContext *pb = s->pb;
+ AVIOContext *dyn_cp, *pb = s->pb;
ebml_master attachments;
AVLFG c;
int i, ret;
@@ -1480,7 +1480,8 @@ static int mkv_write_attachments(AVFormatContext *s)
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_ATTACHMENTS, avio_tell(pb));
if (ret < 0) return ret;
- attachments = start_ebml_master(pb, MATROSKA_ID_ATTACHMENTS, 0);
+ ret = start_ebml_master_crc32(pb, &dyn_cp, &attachments, MATROSKA_ID_ATTACHMENTS, 0);
+ if (ret < 0) return ret;
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
@@ -1492,15 +1493,15 @@ static int mkv_write_attachments(AVFormatContext *s)
if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT)
continue;
- attached_file = start_ebml_master(pb, MATROSKA_ID_ATTACHEDFILE, 0);
+ attached_file = start_ebml_master(dyn_cp, MATROSKA_ID_ATTACHEDFILE, 0);
if (t = av_dict_get(st->metadata, "title", NULL, 0))
- put_ebml_string(pb, MATROSKA_ID_FILEDESC, t->value);
+ put_ebml_string(dyn_cp, MATROSKA_ID_FILEDESC, t->value);
if (!(t = av_dict_get(st->metadata, "filename", NULL, 0))) {
av_log(s, AV_LOG_ERROR, "Attachment stream %d has no filename tag.\n", i);
return AVERROR(EINVAL);
}
- put_ebml_string(pb, MATROSKA_ID_FILENAME, t->value);
+ put_ebml_string(dyn_cp, MATROSKA_ID_FILENAME, t->value);
if (t = av_dict_get(st->metadata, "mimetype", NULL, 0))
mimetype = t->value;
else if (st->codecpar->codec_id != AV_CODEC_ID_NONE ) {
@@ -1538,12 +1539,12 @@ static int mkv_write_attachments(AVFormatContext *s)
av_log(s, AV_LOG_VERBOSE, "Using %.16"PRIx64" for attachment %d\n",
fileuid, i);
- put_ebml_string(pb, MATROSKA_ID_FILEMIMETYPE, mimetype);
- put_ebml_binary(pb, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size);
- put_ebml_uint(pb, MATROSKA_ID_FILEUID, fileuid);
- end_ebml_master(pb, attached_file);
+ put_ebml_string(dyn_cp, MATROSKA_ID_FILEMIMETYPE, mimetype);
+ put_ebml_binary(dyn_cp, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size);
+ put_ebml_uint(dyn_cp, MATROSKA_ID_FILEUID, fileuid);
+ end_ebml_master(dyn_cp, attached_file);
}
- end_ebml_master(pb, attachments);
+ end_ebml_master_crc32(pb, &dyn_cp, mkv, attachments);
return 0;
}
@@ -1,5 +1,5 @@
-ef45f99b000001ec39e3a8e744fbde78 *./tests/data/lavf/lavf.mkv
-472932 ./tests/data/lavf/lavf.mkv
+b3599e3229821a84116b4f03f324a08b *./tests/data/lavf/lavf.mkv
+472938 ./tests/data/lavf/lavf.mkv
./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
c56b90945e6e14a9b4b7f1ab94e3ad28 *./tests/data/lavf/lavf.mkv
320608 ./tests/data/lavf/lavf.mkv
Implements part of ticket #4347 Signed-off-by: James Almer <jamrial@gmail.com> --- libavformat/matroskaenc.c | 21 +++++++++++---------- tests/ref/lavf/mkv | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-)