har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '600d5ee6b12bad144756b0772319bb04796bc528'

Browse Source 
* commit '600d5ee6b12bad144756b0772319bb04796bc528':
  movenc: Signal iso6 in compatible_brands when using tfdt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-30 02:45:55 +01:00
commit 7f24e1e1a2
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/movenc.c
View File

@ -3472,6 +3472,11 @@ static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s)
ffio_wfourcc(pb, "avc1"); ffio_wfourcc(pb, "avc1");
} }
// We add tfdt atoms when fragmenting, signal this with the iso6 compatible
// brand. This is compatible with users that don't understand tfdt.
if (mov->flags & FF_MOV_FLAG_FRAGMENT)
ffio_wfourcc(pb, "iso6");
if (mov->mode == MODE_3GP) if (mov->mode == MODE_3GP)
ffio_wfourcc(pb, has_h264 ? "3gp6":"3gp4"); ffio_wfourcc(pb, has_h264 ? "3gp6":"3gp4");
else if (mov->mode & MODE_3G2) else if (mov->mode & MODE_3G2)

2
tests/ref/fate/sub-movtextenc
View File

@ -1 +1 @@
f632afed498634a01b9c5ae5a2228012 d26e73c420c40a00225060d2e6532df9

12
tests/ref/lavf/ismv
View File

@ -1,9 +1,9 @@
564eaa3553ce02cf0921cd647fa4e6d2 *./tests/data/lavf/lavf.ismv 56193aebd2845871f4e91956b3e4dea5 *./tests/data/lavf/lavf.ismv
312606 ./tests/data/lavf/lavf.ismv 312610 ./tests/data/lavf/lavf.ismv
./tests/data/lavf/lavf.ismv CRC=0xb7d29d29 ./tests/data/lavf/lavf.ismv CRC=0xb7d29d29
53f0506abc827a6540a9faf5e3b761c0 *./tests/data/lavf/lavf.ismv 19c7e128c52d7a1d7a1921d60774a785 *./tests/data/lavf/lavf.ismv
321512 ./tests/data/lavf/lavf.ismv 321516 ./tests/data/lavf/lavf.ismv
./tests/data/lavf/lavf.ismv CRC=0x33834815 ./tests/data/lavf/lavf.ismv CRC=0x33834815
564eaa3553ce02cf0921cd647fa4e6d2 *./tests/data/lavf/lavf.ismv 56193aebd2845871f4e91956b3e4dea5 *./tests/data/lavf/lavf.ismv
312606 ./tests/data/lavf/lavf.ismv 312610 ./tests/data/lavf/lavf.ismv
./tests/data/lavf/lavf.ismv CRC=0xb7d29d29 ./tests/data/lavf/lavf.ismv CRC=0xb7d29d29