summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
Commit message (Collapse)AuthorAge
...
* | Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'Michael Niedermayer2013-10-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388': movenc: Add an F4V muxer Conflicts: Changelog libavformat/allformats.c libavformat/movenc.c libavformat/version.h See: 7bc70930ddc487712419e65ebca4d77868a20ffb Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add an F4V muxerClément Bœsch2013-10-23
| | | | | | | | | | | | | | | | F4V is Adobe's mp4/iso media variant, with the most significant addition/change being supporting other flash codecs than just aac/h264. Signed-off-by: Martin Storsjö <martin@martin.st>
* | movenc: use ff_alloc_extradata()James Almer2013-10-14
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: set XDCAM codec tag correctlyMichael Niedermayer2013-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: set pretty compressor name for XDCAMMichael Niedermayer2013-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: make AVStream easier to accessMichael Niedermayer2013-10-12
| | | | | | | | | | | | This adds a AVStream pointer to Track Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: factor out find_fps()Michael Niedermayer2013-10-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494': movenc: Return a proper error code for invalid combinations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Return a proper error code for invalid combinationsMartin Storsjö2013-09-22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'f1eac2b8a0370b908cd691086d11f51342054730': movenc: Use keyframes as default fragmentation point in ismv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Use keyframes as default fragmentation point in ismvMartin Storsjö2013-09-22
| | | | | | | | | | | | | | | | Fragmenting blindly to a certain duration isn't a good choice if one should be able to switch between different qualities, therefore default to keyframes instead. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd': movenc: Set all implicit flags immediately in mov_write_header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Set all implicit flags immediately in mov_write_headerMartin Storsjö2013-09-22
| | | | | | | | | | | | | | | | This makes sure other sanity checks for conflicting options can work properly, e.g. for the conflict between the faststart flag when using the ismv mode. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | | | | | | | * commit '187023f6b2b43966acb2449a379b4ededdc4b22e': movenc: Set mov->mode earlier in mov_write_header Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Set mov->mode earlier in mov_write_headerMartin Storsjö2013-09-22
| | | | | | | | | | | | | | This allows simplifying some early checks that depend on the muxer mode. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | | | * commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5': movenc: Use null buffers for measuring the amount of data to be written Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Use null buffers for measuring the amount of data to be writtenMartin Storsjö2013-09-19
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-18
|\| | | | | | | | | | | | | | | | | | | * qatar/master: movenc: Add an option for omitting the tfhd base offset Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add an option for omitting the tfhd base offsetMartin Storsjö2013-09-17
| | | | | | | | | | | | | | | | | | | | This makes the output fragments independent of their position in the output stream, making the output work better when streamed. QuickTime Player doesn't support fragmented mp4 without the base data offset, though. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4'Michael Niedermayer2013-09-18
|\| | | | | | | | | | | | | * commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4': movenc: Write the moof atom in two passes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Write the moof atom in two passesMartin Storsjö2013-09-17
| | | | | | | | | | | | | | | | | | | | | | This is a bit more work, but avoids having to fill in the data offset field afterwards instead of directly when the rest of the trun atom is written. This simplifies future cases where this field needs to be set to something different. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-10
|\| | | | | | | | | | | | | | | | | | | * qatar/master: movenc: Simplify setting the fragmentation flag Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Simplify setting the fragmentation flagMartin Storsjö2013-09-09
| | | | | | | | | | | | | | This makes sure the faststart vs fragmentation check works as intended when fragmentation is enabled due to using the ismv mode. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'Michael Niedermayer2013-09-10
|\| | | | | | | | | | | | | | | | | | | * commit '8b524ab0c43c1767919530abb79d3656113cdc47': movenc: Add a warning message if conflicting options have been specified Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add a warning message if conflicting options have been specifiedMartin Storsjö2013-09-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-03
|\| | | | | | | | | | | | | * qatar/master: movenc: Don't flush after each written packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Don't flush after each written packetMartin Storsjö2013-09-03
| | | | | | | | | | | | | | | | | | | | This should improve write performance quite significantly. --- Tested with both writing a normal mp4, by using the faststart feature and writing a fragmented mp4 file; all turn out with the same md5sum as before. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/movenc: Use the rate from av_timecode_init_from_string() for tmcdMichael Niedermayer2013-09-02
| | | | | | | | | | | | Fixes Ticket2892 Reveiwed-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-27
|\| | | | | | | | | | | | | * qatar/master: movenc: Check for errors from mov_create_chapter_track Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Check for errors from mov_create_chapter_trackMartin Storsjö2013-08-27
| | | | | | | | | | | | | | | | | | | | | | On failures in the write_trailer function, we could also ignore the errors and try to finish the file despite these errors (which would only leave an incomplete chapters track). It's probably better to signal the error clearly to the caller though (and if this function failed there's no guarantee that there's enough memory to finish the trailer either). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'Michael Niedermayer2013-08-27
|\| | | | | | | | | | | | | | | | | | | * commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242': movenc: Properly free allocated data on failures in mov_write_header Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Properly free allocated data on failures in mov_write_headerMartin Storsjö2013-08-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe'Michael Niedermayer2013-08-27
|\| | | | | | | | | | | | | | | | | | | * commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe': movenc: Check that tracks->enc exists before trying to free extradata Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Check that tracks->enc exists before trying to free extradataMartin Storsjö2013-08-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '4d122b01e4ce539269ee2df193b061772c7374f6'Michael Niedermayer2013-08-27
|\| | | | | | | | | | | | | * commit '4d122b01e4ce539269ee2df193b061772c7374f6': movenc: Check for allocation failures in mov_create_chapter_track Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Check for allocation failures in mov_create_chapter_trackMartin Storsjö2013-08-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63'Michael Niedermayer2013-08-26
|\| | | | | | | | | | | | | | | | | | | * commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63': mov: Write tmcd extradata This commit should make no difference as we had tmcd support already, which is not changed. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Write tmcd extradataLuca Barbato2013-08-25
| |
* | avcodec/movenc: move chapter_properties under the #if of the code that uses itMichael Niedermayer2013-08-24
| | | | | | | | | | | | Fixes warning about unused variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: Make tkhd "enabled" flag QuickTime compatible Conflicts: libavformat/movenc.c tests/ref/acodec/alac tests/ref/acodec/pcm-s16be tests/ref/acodec/pcm-s24be tests/ref/acodec/pcm-s32be tests/ref/acodec/pcm-s8 tests/ref/lavf/mov tests/ref/vsynth/vsynth1-dnxhd-1080i tests/ref/vsynth/vsynth1-mpeg4 tests/ref/vsynth/vsynth1-prores tests/ref/vsynth/vsynth1-qtrle tests/ref/vsynth/vsynth1-svq1 tests/ref/vsynth/vsynth2-dnxhd-1080i tests/ref/vsynth/vsynth2-mpeg4 tests/ref/vsynth/vsynth2-prores tests/ref/vsynth/vsynth2-qtrle tests/ref/vsynth/vsynth2-svq1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Make tkhd "enabled" flag QuickTime compatibleJohn Stebbins2013-08-23
| | | | | | | | | | | | | | | | QuickTime will play multiple audio tracks concurrently if this flag is set for multiple audio tracks. And if no subtitle track has this flag set, QuickTime will show no subtitles in the subtitle menu. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/movenc: use av_freep() instead of av_free() except for local ↵Michael Niedermayer2013-08-23
| | | | | | | | | | | | variables before return Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '60198742ff851f11a3757c713fc75a9c19b88566'Michael Niedermayer2013-08-22
|\| | | | | | | | | | | | | | | | | | | * commit '60198742ff851f11a3757c713fc75a9c19b88566': movenc: fix detection of 64bit offset requirement Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: fix detection of 64bit offset requirementClément Bœsch2013-08-21
| | | | | | | | | | | | The old method doesn't work when moov is relocated to beginning of file Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'Michael Niedermayer2013-08-22
|\| | | | | | | | | | | | | * commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e': movenc: Make chapter track QuickTime compatible Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Make chapter track QuickTime compatibleJohn Stebbins2013-08-21
| | | | | | | | | | | | QuickTime requires that the stsd.text box be completely filled in. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'Michael Niedermayer2013-08-22
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b': movenc: add faststart option for web streaming Conflicts: doc/muxers.texi libavformat/movenc.c libavformat/movenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: add faststart option for web streamingClément Bœsch2013-08-21
| | | | | | | | | | | | | | Faststart moves the moov atom to the beginning of the file and rewrites the rest of the file after muxing is complete. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb'Michael Niedermayer2013-08-21
|\| | | | | | | | | | | | | | | | | | | * commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb': movenc: Allow chapters to be written in trailer Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Allow chapters to be written in trailerJohn Stebbins2013-08-20
| | | | | | | | | | | | | | | | This allows creation of frame accurate chapter marks from sources like DVD and BD where the precise chapter location is not known until the chapter mark has been reached during reading. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 07:45:28 +0000