diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 2a71d1dc19..dd5a9547eb 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1197,8 +1197,8 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) break; default: av_log(s->avctx, AV_LOG_ERROR, - "unsupported marker 0x%.4X at pos 0x%lX\n", - marker, (uint64_t)(s->buf - s->buf_start - 4)); + "unsupported marker 0x%.4X at pos 0x%tX\n", + marker, s->buf - s->buf_start - 4); s->buf += len - 2; break; } diff --git a/libavformat/mmf.c b/libavformat/mmf.c index e3c95cca36..cb87a6dddb 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -98,6 +98,7 @@ static int mmf_write_header(AVFormatContext *s) avio_w8(pb, 0); /* status */ avio_w8(pb, 0); /* counts */ end_tag_be(pb, pos); + pos = ff_start_tag(pb, "OPDA"); avio_write(pb, version, strlen(version)); /* metadata ("ST:songtitle,VN:version,...") */ end_tag_be(pb, pos);