diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-31 02:51:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-31 02:52:43 +0100 |
| commit | dd2f86864491e203b18889e3516807037e660ab1 (patch) | |
| tree | bd17884cdfb82c81a1759d3530da5cf118a9c04a /libavformat/movenc.c | |
| parent | 77eff7a58a436e4b1c1adb54a12dd4f3cead28d2 (diff) | |
| parent | aae6b3b918b4133b8cc2d1631196c1d406d0351a (diff) | |
| download | ffmpeg-dd2f86864491e203b18889e3516807037e660ab1.tar.gz | |
Merge commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a'
* commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a':
movenc: Don't write any iso brands in ismv files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index f878ced0fa..974edea462 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3478,8 +3478,6 @@ static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s) ffio_wfourcc(pb, "qt "); else if (mov->mode == MODE_ISM) { 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)) { ffio_wfourcc(pb, "isom"); ffio_wfourcc(pb, "iso2"); |