Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavformat/mux.c
AgeCommit message (Collapse)Author
2015-02-11Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'Michael Niedermayer
* commit '9deaec782810d098bca11c9332fab2d2f4c5fb78': lavf: move internal fields from public to internal context Conflicts: libavformat/avformat.h libavformat/internal.h libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-10lavf: move internal fields from public to internal contextwm4
This is not an API change; the fields were explicitly declared private before. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-31avformat/mux: remove unneeded #include, there are no assert() only av_assert*Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-12-29avformat/mux: 2 subtitle packets could have the same DTSMichael Niedermayer
Fixes Ticket3514 See: ETSI EN 300 743 V1.3.1 (2006-11) "In summary, all of the segments of a single display set shall be carried in one (or more) PES packets that have the same PTS value." with PTS = DTS and remuxing of such a stream it is to be expected that sometimes multiple packets would have the same DTS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-20libavformat: Allow calling av_write_trailer with a NULL AVIOContextMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-20lavf/mux: Always call write_trailer() from av_write_trailer() to avoid a leak.Carl Eugen Hoyos
Fixes ticket #4049.
2014-11-18Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd'Michael Niedermayer
* commit '9257692ac15eff7b07540c1f61cebde0d8823fbd': lavf: Only initialize s->offset once when using avoid_negative_ts make_zero Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18lavf: Only initialize s->offset once when using avoid_negative_ts make_zeroMartin Storsjö
When given a stream starting at dts=0, it would previously consider s->offset as uninitialized and set an offset when the second packet was written, ending up writing two packets with dts=0. By initializing this field to AV_NOPTS_VALUE, we make sure that we only initialize it once, on the first packet. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-08Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'Michael Niedermayer
* commit '897d5c3a4296f3da80b8699d1487328ca2de8e55': lavf: Print a warning if failed to avoid negative timestamps when requested Conflicts: libavformat/mux.c See: ec6a5fc6cca22e4eb0a91cc8fba786d41ade2032 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08Merge commit '1384df641994bf3d6cb51084290aa94752737bae'Michael Niedermayer
* commit '1384df641994bf3d6cb51084290aa94752737bae': lavf: Add an option for avoiding negative timestamps Conflicts: libavformat/avformat.h libavformat/mux.c libavformat/options_table.h libavformat/version.h See: 3ba0dab76ac32f0c9f50c916a73bc64e43c1fdf9 See: a89c01253190b9eb9de8e28a3252423bf7732511 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07lavf: Print a warning if failed to avoid negative timestamps when requestedMichael Niedermayer
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-07lavf: Add an option for avoiding negative timestampsMichael Niedermayer
This is the same logic as is invoked on AVFMT_TS_NEGATIVE, but which can be enabled manually, or can be enabled in muxers which only need it in certain conditions. Also allow using the same mechanism to force streams to start at 0. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-06Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'Michael Niedermayer
* commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e': lavf: use the format context strict_std_compliance instead of the codec one Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06lavf: use the format context strict_std_compliance instead of the codec oneAnton Khirnov
2014-10-22avformat/mux: Fix assertion failure due to max_interleave_delta and poor inputMichael Niedermayer
Fixes Ticket4051 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'Michael Niedermayer
* commit '2d6e58497e76836604364b037df9b00ba3d75b69': lavf: switch to AVCodecContext.framerate for demuxing Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15lavf: switch to AVCodecContext.framerate for demuxingAnton Khirnov
2014-10-10Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'Michael Niedermayer
* commit 'eb4f9069002e73648f6640cd054fc814cfda75b8': lavf: More informative error message Conflicts: libavformat/mux.c See: 30ced7e69f434bd49b39fb7c8ce02d9ba71babfc Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-10lavf: More informative error messageLuca Barbato
Print the timestamp values and not just the stream index.
2014-10-06avformat: remove obsolete FF_API_ALLOC_OUTPUT_CONTEXT cruftJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2014-08-14lavf: eliminate ff_get_audio_frame_size()Anton Khirnov
It is basically a wrapper around av_get_audio_frame_duration(), with a fallback to AVCodecContext.frame_size. However, that field is set only when the stream codec context is actually used for encoding or decoding, which is discouraged. For muxing, it is generally the responsibility of the caller to set the packet duration. For demuxing, if the duration is not stored at the container level, it should be set by the parser. Therefore, removing the frame_size fallback should not break any important case. (cherry picked from commit 30e50c50274f88f0f5ae829f401cd3c7f5266719) Conflicts: libavformat/utils.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03avformat/mux: flush after header writing, like after packetsMichael Niedermayer
This makes problematic unconditional flushes in mpegts redundant And is thus part of a fix for ticket 2748 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-30lavf/mux: Fix a typo checking aspect ratios.Carl Eugen Hoyos
Fixes ticket #3813.
2014-07-26avformat/mux: ignore delayed vp8/9 packets in max_interleave_delta calculationMichael Niedermayer
libvpx adds very significant delay, which appears normal and we must buffer all other streams no matter what to interleave them correctly Fixes Ticket3440 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-25avformat/mux: support re-interleaving packets in ff_write_chained()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-25avformat/mux: keep AVPacket fields consistent in ff_write_chained()Michael Niedermayer
This might have caused double frees in theory, i do not have a test case though Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'Michael Niedermayer
* commit '324ff59444ff5470bb325ff1e2be7c4b054fc944': avpacket: Check for and return errors in ff_interleave_add_packet() Conflicts: libavformat/audiointerleave.c libavformat/internal.h libavformat/mux.c See: 4d7c71c36467331f1e0c0f17af9f371d33308a9c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17avpacket: Check for and return errors in ff_interleave_add_packet()Nidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-06-28avformat/mux: fix flush_packets flag with flushing buffersMichael Niedermayer
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18avformat/mux: simplify ff_choose_timebase()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18Merge commit '194be1f43ea391eb986732707435176e579265aa'Michael Niedermayer
* commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18lavf: switch to AVStream.time_base as the hint for the muxer timebaseAnton Khirnov
Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
2014-06-02avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02avformat/mux: fix memleak of side data in flac fate testsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20avformat/mux: Remove localized encoder stringsMichael Niedermayer
Fixes muxing to end up with a encoder=Lavf... and encoder_eng=somethingelse Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19Merge commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c'Michael Niedermayer
* commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c': lavf: deprecate now unused AVStream.pts Conflicts: libavformat/mux.c libavformat/version.h mostly not merged as the code is needed for a/vsync drop handling and what the code does is what is needed, it could maybe be moved elsewhere or factored somehow but simply removing it would be droping these features. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19lavf: deprecate now unused AVStream.ptsAnton Khirnov
2014-05-19mux: drop one of the hacks comprising compute_pkt_fields2()Anton Khirnov
All encoders should output proper timestamps now.
2014-05-15Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'Michael Niedermayer
* commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf': lavf: drop the zero-sized packets hack Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'Michael Niedermayer
* commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52': lavf: add AVFMT_FLAG_BITEXACT. Conflicts: doc/APIchanges libavformat/avformat.h libavformat/flacenc.c libavformat/movenc.c libavformat/oggenc.c libavformat/options_table.h libavformat/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15lavf: drop the zero-sized packets hackAnton Khirnov
There should not be any valid reason anymore for passing completely empty packets to lavf. OTOH side data-only packets can be useful.
2014-05-15lavf: add AVFMT_FLAG_BITEXACT.Anton Khirnov
Use it instead of checking CODEC_FLAG_BITEXACT in the first stream's codec context. Using codec options inside lavf is fragile and can easily break when the muxing codec context is not the encoding context.
2014-05-04lavf/mux: pass options to nested structs of priv dataLukasz Marek
This is continuation of commit 330d547e Nested struct is set in two places. Previous commit set nested struct only in one case. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-02lavf/mux: pass options to nested structs of priv dataLukasz Marek
This commit allows to benefit from implementing child_next callback for muxers' AVClasses. Without that, options cannot be set in nested structs. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-23avformat/mux: Check for and remove invalid packet durationsMichael Niedermayer
Fixes assertion failure Fixes Ticket3575 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-22Various small spelling fixes.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-02-23avformat/mux: support shifting timestamps so they start at 0Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20lavf/mux: check av_dup_packet() return value.Nicolas George
Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-11lavf: add write_uncoded_frame() API.Nicolas George
2014-02-10Merge commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703'Michael Niedermayer
* commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703': lavf: always unref the packet passed to av_interleaved_write_frame() on error Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 16:51:32 +0300