From a349458e6769df0ddd62cb12784e7205c8d1ca58 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 13 May 2013 21:40:53 +0200 Subject: [PATCH 1/3] jpeg2000dec: Use correct printf length modifier for pointer differences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also eliminate an unnecessary cast. Fixes the following warning: jpeg2000dec.c:1200:20: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘long long unsigned int’ --- libavcodec/jpeg2000dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 11211d3c8e..f8a89b1e44 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1196,8 +1196,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; } From 3dff1bf99c65230cd62a06d4a4e5ab569a321eeb Mon Sep 17 00:00:00 2001 From: Yoshihisa Uchida Date: Sat, 5 Jan 2013 23:11:09 +0100 Subject: [PATCH 2/3] mmf: Write metadata into an Optional Data chunk Signed-off-by: Luca Barbato --- libavformat/mmf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/mmf.c b/libavformat/mmf.c index 84c4ef7146..61f1d7adf4 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -83,7 +83,10 @@ static int mmf_write_header(AVFormatContext *s) avio_w8(pb, 0); /* code type */ avio_w8(pb, 0); /* status */ avio_w8(pb, 0); /* counts */ - avio_write(pb, "VN:libavcodec,", sizeof("VN:libavcodec,") - 1); /* metadata ("ST:songtitle,VN:version,...") */ + end_tag_be(pb, pos); + + pos = ff_start_tag(pb, "OPDA"); + avio_write(pb, "VN:libavcodec,", sizeof("VN:libavcodec,") -1); /* metadata ("ST:songtitle,VN:version,...") */ end_tag_be(pb, pos); avio_write(pb, "ATR\x00", 4); From 7cbc4cb4424430586ce2d5c0dba81174c6d1db01 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Tue, 14 May 2013 18:03:43 +0200 Subject: [PATCH 3/3] fate: update the mmf reference Using Optional Data chunk introduced changes the hash. --- tests/ref/lavf/mmf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ref/lavf/mmf b/tests/ref/lavf/mmf index 0614051592..947abc746b 100644 --- a/tests/ref/lavf/mmf +++ b/tests/ref/lavf/mmf @@ -1,3 +1,3 @@ -19625430b231dd130dbb0c13de1036fa *./tests/data/lavf/lavf.mmf -22609 ./tests/data/lavf/lavf.mmf +1a3bbf19a41668c1e928bcafce88ff3e *./tests/data/lavf/lavf.mmf +22617 ./tests/data/lavf/lavf.mmf ./tests/data/lavf/lavf.mmf CRC=0x8dea1388