* commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01': fate: update the mmf reference mmf: Write metadata into an Optional Data chunk jpeg2000dec: Use correct printf length modifier for pointer differences Conflicts: libavformat/mmf.c tests/ref/lavf/mmf
Unified · Split
| @@ -1197,8 +1197,8 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) · 1196 unmodified lines | |||
| 1197 | break; | 1197 | break; |
| 1198 | default: | 1198 | default: |
| 1199 | av_log(s->avctx, AV_LOG_ERROR, | 1199 | av_log(s->avctx, AV_LOG_ERROR, |
| 1200 | "unsupported marker 0x%.4X at pos 0x%lX\n", | 1200 | "unsupported marker 0x%.4X at pos 0x%tX\n", |
| 1201 | marker, (uint64_t)(s->buf - s->buf_start - 4)); | 1201 | marker, s->buf - s->buf_start - 4); |
| 1202 | s->buf += len - 2; | 1202 | s->buf += len - 2; |
| 1203 | break; | 1203 | break; |
| 1204 | } | 1204 | } |
| @@ -98,6 +98,7 @@ static int mmf_write_header(AVFormatContext *s) · 97 unmodified lines | |||
| 98 | avio_w8(pb, 0); /* status */ | 98 | avio_w8(pb, 0); /* status */ |
| 99 | avio_w8(pb, 0); /* counts */ | 99 | avio_w8(pb, 0); /* counts */ |
| 100 | end_tag_be(pb, pos); | 100 | end_tag_be(pb, pos); |
| 101 | |||
| 101 | pos = ff_start_tag(pb, "OPDA"); | 102 | pos = ff_start_tag(pb, "OPDA"); |
| 102 | avio_write(pb, version, strlen(version)); /* metadata ("ST:songtitle,VN:version,...") */ | 103 | avio_write(pb, version, strlen(version)); /* metadata ("ST:songtitle,VN:version,...") */ |
| 103 | end_tag_be(pb, pos); | 104 | end_tag_be(pb, pos); |