end_ebml_master_crc32_preliminary() has a MatroskaMuxContext as parameter that isn't used at all. So remove it. Furthermore it doesn't close its dynamic buffer; it just uses the underlying buffer and therefore it only needs a pointer to the dynamic buffer, not a pointer to a pointer.
Unified · Split
| @@ -361,11 +361,11 @@ static void end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, · 360 unmodified lines | |||
| 361 | /** | 361 | /** |
| 362 | * Complete ebml master without destroying the buffer, allowing for later updates | 362 | * Complete ebml master without destroying the buffer, allowing for later updates |
| 363 | */ | 363 | */ |
| 364 | static void end_ebml_master_crc32_preliminary(AVIOContext *pb, AVIOContext **dyn_cp, MatroskaMuxContext *mkv, | 364 | static void end_ebml_master_crc32_preliminary(AVIOContext *pb, AVIOContext *dyn_cp, |
| 365 | uint32_t id, int64_t *pos) | 365 | uint32_t id, int64_t *pos) |
| 366 | { | 366 | { |
| 367 | uint8_t *buf; | 367 | uint8_t *buf; |
| 368 | int size = avio_get_dyn_buf(*dyn_cp, &buf); | 368 | int size = avio_get_dyn_buf(dyn_cp, &buf); |
| 369 | 369 | ||
| 370 | *pos = avio_tell(pb); | 370 | *pos = avio_tell(pb); |
| 371 | 371 | ||
| @@ -1388,7 +1388,7 @@ static int mkv_write_tracks(AVFormatContext *s) · 1016 unmodified lines | |||
| 1388 | } | 1388 | } |
| 1389 | 1389 | ||
| 1390 | if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) | 1390 | if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) |
| 1391 | end_ebml_master_crc32_preliminary(pb, &mkv->tracks_bc, mkv, | 1391 | end_ebml_master_crc32_preliminary(pb, mkv->tracks_bc, |
| 1392 | MATROSKA_ID_TRACKS, &mkv->tracks_pos); | 1392 | MATROSKA_ID_TRACKS, &mkv->tracks_pos); |
| 1393 | else | 1393 | else |
| 1394 | end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, MATROSKA_ID_TRACKS); | 1394 | end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, MATROSKA_ID_TRACKS); |
| @@ -1643,7 +1643,7 @@ static int mkv_write_tags(AVFormatContext *s) · 248 unmodified lines | |||
| 1643 | 1643 | ||
| 1644 | if (mkv->tags_bc) { | 1644 | if (mkv->tags_bc) { |
| 1645 | if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) | 1645 | if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) |
| 1646 | end_ebml_master_crc32_preliminary(s->pb, &mkv->tags_bc, mkv, | 1646 | end_ebml_master_crc32_preliminary(s->pb, mkv->tags_bc, |
| 1647 | MATROSKA_ID_TAGS, &mkv->tags_pos); | 1647 | MATROSKA_ID_TAGS, &mkv->tags_pos); |
| 1648 | else | 1648 | else |
| 1649 | end_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS); | 1649 | end_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS); |
| @@ -1880,7 +1880,7 @@ static int mkv_write_header(AVFormatContext *s) · 230 unmodified lines | |||
| 1880 | } | 1880 | } |
| 1881 | } | 1881 | } |
| 1882 | if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) | 1882 | if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) |
| 1883 | end_ebml_master_crc32_preliminary(s->pb, &mkv->info_bc, mkv, | 1883 | end_ebml_master_crc32_preliminary(s->pb, mkv->info_bc, |
| 1884 | MATROSKA_ID_INFO, &mkv->info_pos); | 1884 | MATROSKA_ID_INFO, &mkv->info_pos); |
| 1885 | else | 1885 | else |
| 1886 | end_ebml_master_crc32(s->pb, &mkv->info_bc, mkv, MATROSKA_ID_INFO); | 1886 | end_ebml_master_crc32(s->pb, &mkv->info_bc, mkv, MATROSKA_ID_INFO); |