Also add some space around operators and wrap a comment that extends past the 80 char "limit"/guideline.
Unified · Split
| @@ -2863,20 +2863,22 @@ static int mov_write_trailer(AVFormatContext *s) · 2862 unmodified lines | |||
| 2863 | int64_t moov_pos = avio_tell(pb); | 2863 | int64_t moov_pos = avio_tell(pb); |
| 2864 | 2864 | ||
| 2865 | if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) { | 2865 | if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) { |
| 2866 | /* Write size of mdat tag */ | 2866 | /* Write size of mdat tag */ |
| 2867 | if (mov->mdat_size+8 <= UINT32_MAX) { | 2867 | if (mov->mdat_size + 8 <= UINT32_MAX) { |
| 2868 | avio_seek(pb, mov->mdat_pos, SEEK_SET); | 2868 | avio_seek(pb, mov->mdat_pos, SEEK_SET); |
| 2869 | avio_wb32(pb, mov->mdat_size+8); | 2869 | avio_wb32(pb, mov->mdat_size + 8); |
| 2870 | } else { | 2870 | } else { |
| 2871 | /* overwrite 'wide' placeholder atom */ | 2871 | /* overwrite 'wide' placeholder atom */ |
| 2872 | avio_seek(pb, mov->mdat_pos - 8, SEEK_SET); | 2872 | avio_seek(pb, mov->mdat_pos - 8, SEEK_SET); |
| 2873 | avio_wb32(pb, 1); /* special value: real atom size will be 64 bit value after tag field */ | 2873 | /* special value: real atom size will be 64 bit value after |
| 2874 | ffio_wfourcc(pb, "mdat"); | 2874 | * tag field */ |
| 2875 | avio_wb64(pb, mov->mdat_size+16); | 2875 | avio_wb32(pb, 1); |
| 2876 | } | 2876 | ffio_wfourcc(pb, "mdat"); |
| 2877 | avio_seek(pb, moov_pos, SEEK_SET); | 2877 | avio_wb64(pb, mov->mdat_size + 16); |
| 2878 | } | ||
| 2879 | avio_seek(pb, moov_pos, SEEK_SET); | ||
| 2878 | 2880 | ||
| 2879 | mov_write_moov_tag(pb, mov, s); | 2881 | mov_write_moov_tag(pb, mov, s); |
| 2880 | } else { | 2882 | } else { |
| 2881 | mov_flush_fragment(s); | 2883 | mov_flush_fragment(s); |
| 2882 | mov_write_mfra_tag(pb, mov); | 2884 | mov_write_mfra_tag(pb, mov); |