diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:15:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:15:15 +0200 |
| commit | 85de84c3e0396be2e51298ca26e405ce629a9fa9 (patch) | |
| tree | 26140c81ba436e4f865dcce5d2e7855a9634f403 | |
| parent | 23439cf99bcf3e6f98bffdff8ba935506be31f2b (diff) | |
| parent | 7cbc4cb4424430586ce2d5c0dba81174c6d1db01 (diff) | |
| download | ffmpeg-85de84c3e0396be2e51298ca26e405ce629a9fa9.tar.gz | |
Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'
* 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
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 4 | ||||
| -rw-r--r-- | libavformat/mmf.c | 1 |
2 files changed, 3 insertions, 2 deletions
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); |