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 /libavformat/mmf.c | |
| parent | 23439cf99bcf3e6f98bffdff8ba935506be31f2b (diff) | |
| parent | 7cbc4cb4424430586ce2d5c0dba81174c6d1db01 (diff) | |
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>
Diffstat (limited to 'libavformat/mmf.c')
| -rw-r--r-- | libavformat/mmf.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |