diff options
| -rw-r--r-- | libavformat/matroskaenc.c | 21 | ||||
| -rw-r--r-- | tests/ref/lavf/mkv | 4 |
2 files changed, 13 insertions, 12 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 98fdccf59e..e36f7e22cb 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1483,7 +1483,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; @@ -1496,7 +1496,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]; @@ -1508,15 +1509,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 ) { @@ -1554,12 +1555,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; } diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 52731fff3d..5a3293f672 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,5 +1,5 @@ -4fdac7e958a68c7c9a64721cb39b124a *./tests/data/lavf/lavf.mkv -472911 ./tests/data/lavf/lavf.mkv +c7c1e2e55e8f04708deb6a552ae59fda *./tests/data/lavf/lavf.mkv +472917 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 82cd3b90ed54ede177d1a7e6c96ee801 *./tests/data/lavf/lavf.mkv 320587 ./tests/data/lavf/lavf.mkv |