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

Merge commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a'

Browse Source 
* commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a':
  movenc: Don't write any iso brands in ismv files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/71/merge
Michael Niedermayer 10 years ago
parent 77eff7a58a aae6b3b918
commit dd2f868644
2 changed files with 6 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavformat/movenc.c
  2. 12
      tests/ref/lavf/ismv

2
libavformat/movenc.c
Unescape View File

@ -3478,8 +3478,6 @@ static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s)
ffio_wfourcc(pb, "qt "); ffio_wfourcc(pb, "qt ");
else if (mov->mode == MODE_ISM) { else if (mov->mode == MODE_ISM) {
ffio_wfourcc(pb, "piff"); ffio_wfourcc(pb, "piff");
if (!(mov->flags & FF_MOV_FLAG_DEFAULT_BASE_MOOF))
ffio_wfourcc(pb, "iso2");
} else if (!(mov->flags & FF_MOV_FLAG_DEFAULT_BASE_MOOF)) { } else if (!(mov->flags & FF_MOV_FLAG_DEFAULT_BASE_MOOF)) {
ffio_wfourcc(pb, "isom"); ffio_wfourcc(pb, "isom");
ffio_wfourcc(pb, "iso2"); ffio_wfourcc(pb, "iso2");

12
tests/ref/lavf/ismv
Unescape View File

@ -1,9 +1,9 @@
17b0b8eff852edd25fa38aed062689d7 *./tests/data/lavf/lavf.ismv b1106bfcdbd1bb12be9161320351dd00 *./tests/data/lavf/lavf.ismv
312546 ./tests/data/lavf/lavf.ismv 312542 ./tests/data/lavf/lavf.ismv
./tests/data/lavf/lavf.ismv CRC=0xb7d29d29 ./tests/data/lavf/lavf.ismv CRC=0xb7d29d29
543e5146df7bd4b7eb7edc94e0034ad9 *./tests/data/lavf/lavf.ismv c8bea6c84b6274f14042381045b0f532 *./tests/data/lavf/lavf.ismv
321452 ./tests/data/lavf/lavf.ismv 321448 ./tests/data/lavf/lavf.ismv
./tests/data/lavf/lavf.ismv CRC=0x33834815 ./tests/data/lavf/lavf.ismv CRC=0x33834815
17b0b8eff852edd25fa38aed062689d7 *./tests/data/lavf/lavf.ismv b1106bfcdbd1bb12be9161320351dd00 *./tests/data/lavf/lavf.ismv
312546 ./tests/data/lavf/lavf.ismv 312542 ./tests/data/lavf/lavf.ismv
./tests/data/lavf/lavf.ismv CRC=0xb7d29d29 ./tests/data/lavf/lavf.ismv CRC=0xb7d29d29

Write Preview
Loading…
Cancel
Save