diff options
| author | 内田佳久 <yoshihisa.uchida@gmail.com> | 2013-01-05 23:11:09 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-05 23:11:09 +0100 |
| commit | 7e5d4fa97d28e7f669351fc56742967b3eaac25d (patch) | |
| tree | 338ea34119a52bac72bca945d960bf91e911952c | |
| parent | f3c9d66bafde9b8586bd63dd3307daa87352af75 (diff) | |
| download | ffmpeg-7e5d4fa97d28e7f669351fc56742967b3eaac25d.tar.gz | |
mmf.c: Do not write metadata into the SMAF Contents Info chunk.
| -rw-r--r-- | libavformat/mmf.c | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/mmf | 4 | ||||
| -rw-r--r-- | tests/ref/seek/lavf-mmf | 36 |
3 files changed, 22 insertions, 20 deletions
diff --git a/libavformat/mmf.c b/libavformat/mmf.c index 1d5a883c8e..a63d8cb30a 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -83,6 +83,8 @@ static int mmf_write_header(AVFormatContext *s) avio_w8(pb, 1); /* code type */ avio_w8(pb, 0); /* status */ avio_w8(pb, 0); /* counts */ + 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); diff --git a/tests/ref/lavf/mmf b/tests/ref/lavf/mmf index 89097842a0..e94d3a2785 100644 --- a/tests/ref/lavf/mmf +++ b/tests/ref/lavf/mmf @@ -1,3 +1,3 @@ -1982e25aaa5307068c5e0f0fd54b193a *./tests/data/lavf/lavf.mmf -22609 ./tests/data/lavf/lavf.mmf +786815c553a0bd2cb066f27a911f1b1f *./tests/data/lavf/lavf.mmf +22617 ./tests/data/lavf/lavf.mmf ./tests/data/lavf/lavf.mmf CRC=0x03633476 diff --git a/tests/ref/seek/lavf-mmf b/tests/ref/seek/lavf-mmf index 9324d0de0a..9c32cab885 100644 --- a/tests/ref/seek/lavf-mmf +++ b/tests/ref/seek/lavf-mmf @@ -1,44 +1,44 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 81 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 89 size: 4096 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 81 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 89 size: 4096 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20561 size: 2048 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20569 size: 2048 ret: 0 st: 0 flags:0 ts: 0.788345 -ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20561 size: 2048 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20569 size: 2048 ret:-1 st: 0 flags:1 ts:-0.317506 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20561 size: 2048 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20569 size: 2048 ret: 0 st: 0 flags:0 ts: 0.365011 -ret: 0 st: 0 flags:1 dts: 0.371519 pts: 0.371519 pos: 8273 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.371519 pts: 0.371519 pos: 8281 size: 4096 ret:-1 st: 0 flags:1 ts:-0.740839 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20561 size: 2048 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20569 size: 2048 ret: 0 st: 0 flags:0 ts:-0.058322 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 81 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 89 size: 4096 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20561 size: 2048 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20569 size: 2048 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos: 12369 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos: 12377 size: 4096 ret: 0 st: 0 flags:0 ts:-0.481655 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 81 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 89 size: 4096 ret: 0 st: 0 flags:1 ts: 2.412494 -ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20561 size: 2048 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20569 size: 2048 ret:-1 st:-1 flags:0 ts: 1.306672 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.185760 pts: 0.185760 pos: 4177 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.185760 pts: 0.185760 pos: 4185 size: 4096 ret: 0 st: 0 flags:0 ts:-0.904989 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 81 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 89 size: 4096 ret: 0 st: 0 flags:1 ts: 1.989184 -ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20561 size: 2048 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20569 size: 2048 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20561 size: 2048 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20569 size: 2048 ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st: 0 flags:0 ts: 2.671678 ret: 0 st: 0 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20561 size: 2048 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 20569 size: 2048 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos: 12369 size: 4096 +ret: 0 st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos: 12377 size: 4096 ret:-1 st:-1 flags:1 ts:-0.645825 |