aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/movenc.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer2014-04-021-2/+5
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * More correct printf format specifiersDiego Biurrun2014-04-021-2/+5
| | | | | | | | This avoids compiler warnings about argument and specifier type mismatch.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-311-3/+7
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: mov: Unbreak sbtl writing Conflicts: libavformat/movenc.c See: 8a9d0a1561470a185a3d09676fcf9b44830a4bfe Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Unbreak sbtl writingMichael Niedermayer2014-03-311-3/+7
| |
* | avformat/movenc: fix if vs if elseMichael Niedermayer2014-03-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-291-5/+78
|\| | | | | | | | | | | | | * qatar/master: movenc: Add dvd subtitle support Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add dvd subtitle supportJohn Stebbins2014-03-281-5/+78
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'Michael Niedermayer2014-03-231-1/+4
|\| | | | | | | | | | | | | | | | | | | * commit '1e9db41e2a2166be5671b088ef4ad06a40af459f': movenc: Allow override of major brand in ftyp atom Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Allow override of major brand in ftyp atomJohn Stebbins2014-03-231-1/+4
| | | | | | | | Signed-off-by: Tim Walker <tdskywalker@gmail.com>
* | avformat/movenc: omit avformat ident from isml_manifest for bitexact modeMichael Niedermayer2014-03-161-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: omit LIBAVCODEC_IDENT for bitexact mode from uuidusmt_tagMichael Niedermayer2014-03-161-1/+3
| | | | | | | | | | | | This code is apparently not tested by fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: only ommit encoder tag of the metadata for bitexact modeMichael Niedermayer2014-03-161-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: encode compilation metadataPeter Ross2014-03-151-0/+1
| | | | | | | | | | | | | | Fixes ticket #2960. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mvformat/movenc: fix IMXMichael Niedermayer2014-03-131-1/+4
| | | | | | | | | | | | | | fixes Ticket3351 Tested-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: rescale when copying duration to timecode trackBryce McLeod2014-03-121-1/+4
| | | | | | | | | | | | Fixes Ticket3453 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Replace an incorrect av_free() in movenc.c with av_freep().Carl Eugen Hoyos2014-03-101-1/+1
| |
* | Merge commit '4f3db5d3418a24f3b90422e98ad75388052c4284'Michael Niedermayer2014-03-091-0/+1
|\| | | | | | | | | | | | | * commit '4f3db5d3418a24f3b90422e98ad75388052c4284': movenc: allow muxing HEVC in MODE_MP4. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: allow muxing HEVC in MODE_MP4.Tim Walker2014-03-091-0/+1
| |
* | Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'Michael Niedermayer2014-03-091-0/+9
|\| | | | | | | | | | | | | * commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926': movenc: enable Annex B to MP4 conversion for HEVC tracks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: enable Annex B to MP4 conversion for HEVC tracks.Tim Walker2014-03-091-0/+9
| |
* | Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'Michael Niedermayer2014-03-091-0/+13
|\| | | | | | | | | | | | | | | | | | | * commit '20b40a597cdd4969cf1147d7c7efee2b6232524b': movenc: write hvcC tag for HEVC. Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: write hvcC tag for HEVC.Tim Walker2014-03-091-0/+13
| |
* | Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c'Michael Niedermayer2014-03-091-1/+2
|\| | | | | | | | | | | | | * commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c': movenc: allow override of "writing application" tag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: allow override of "writing application" tagJohn Stebbins2014-03-081-1/+2
| | | | | | | | | | | | Signed-off-by: Tim Walker <tdskywalker@gmail.com> CC: libav-stable@libav.org
* | avformat/movenc: shift positive timestamps to 0 if edit lists cannot be usedMichael Niedermayer2014-02-221-1/+1
| | | | | | | | | | | | Fix handling of timestamps which start far away from 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: assert that get_cluster_duration() value is validMichael Niedermayer2014-02-211-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: check that the input timestamps are within the range that ↵Michael Niedermayer2014-02-211-0/+11
| | | | | | | | | | | | can be stored in mov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: simplify code, decrease difference to libavMichael Niedermayer2014-02-191-8/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66'Michael Niedermayer2014-02-191-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66': movenc: Add a fallback fragmentation method for plain mp4 as well Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add a fallback fragmentation method for plain mp4 as wellMartin Storsjö2014-02-191-4/+2
| | | | | | | | | | | | | | Previously the default fragmentation method was only enabled if writing an ISM file. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/movenc: return meaningful error code from mov_write_header()Stefano Sabatini2013-12-141-5/+9
| |
* | lavf/movenc: improve feedback in case of unsupported codecStefano Sabatini2013-12-141-2/+3
| |
* | Fix remuxing of IMA_QT in mov.Carl Eugen Hoyos2013-12-091-1/+2
| | | | | | | | Fixes ticket #1603.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-241-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-231-0/+2
| |
* | Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'Michael Niedermayer2013-10-231-2/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-231-1/+37
| | | | | | | | | | | | | | | | 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-141-3/+1
| | | | | | | | | | 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-121-0/+62
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: set pretty compressor name for XDCAMMichael Niedermayer2013-10-121-2/+27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: make AVStream easier to accessMichael Niedermayer2013-10-121-0/+1
| | | | | | | | | | | | This adds a AVStream pointer to Track Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: factor out find_fps()Michael Niedermayer2013-10-081-8/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494'Michael Niedermayer2013-09-231-2/+2
|\| | | | | | | | | | | | | * 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-221-2/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730'Michael Niedermayer2013-09-231-1/+1
|\| | | | | | | | | | | | | * 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-221-1/+1
| | | | | | | | | | | | | | | | 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-231-2/+5
|\| | | | | | | | | | | | | * 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-221-2/+5
| | | | | | | | | | | | | | | | 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-231-12/+14
|\| | | | | | | | | | | | | | | | | | | * 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-221-18/+19
| | | | | | | | | | | | | | This allows simplifying some early checks that depend on the muxer mode. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-13 18:18:22 +0000