Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmf.c: Do not write metadata into the SMAF Contents Info chunk.

Browse Source
pull/8/head
内田佳久 12 years ago committed by Carl Eugen Hoyos
parent f3c9d66baf
commit 7e5d4fa97d
3 changed files with 22 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavformat/mmf.c
  2. 4
      tests/ref/lavf/mmf
  3. 36
      tests/ref/seek/lavf-mmf

2
libavformat/mmf.c
Unescape View File

@ -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);

4
tests/ref/lavf/mmf
Unescape View File

@ -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

36
tests/ref/seek/lavf-mmf
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save