aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/segment.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | avformat/segment: export inner muxer timebaseMichael Niedermayer2014-11-161-0/+8
| | | | | | | | | | | | | | Fixes "Non-monotonous DTS in output stream 0:0" Fixes Ticket4020 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: use time_internal.h, simplify codeMichael Niedermayer2014-11-021-4/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hlsenc.c, segment.c: propagate defaults to mpegtsMika Raento2014-10-171-0/+1
| | | | | | | | | | | | | | | | | | This fixes the abnormally high ts overhead in the files produced by the HLS and segments muxers. See https://trac.ffmpeg.org/ticket/2857 . For example makes it much more likely that it can produces streams that fit under the 64kb App store limit. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'Michael Niedermayer2014-10-071-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit '28816050e47b6dba430a52e429d21a864cffda8e': lavf: Set the stream time base hint properly for chained muxers Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Set the stream time base hint properly for chained muxersMartin Storsjö2014-10-061-0/+1
| | | | | | | | | | | | | | This avoids warnings about using the codec time base as time base hint. Signed-off-by: Martin Storsjö <martin@martin.st>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-151-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | lavf/segment: abort in case of invalid segment format optionsStefano Sabatini2014-09-081-1/+4
| |
* | lavf/segment: add segment_format_options optionStefano Sabatini2014-09-071-2/+23
| |
* | segment: fix copying stream metadataMika Raento2014-09-021-0/+1
| | | | | | | | | | | | To get mpegts metadata copied when segmenting. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | segment: use mpegts_flags instead of the deprecated resend_headers optionMika Raento2014-09-021-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: Use avformat_alloc_output_context2()Michael Niedermayer2014-09-021-4/+5
| | | | | | | | | | | | | | | | This avoids having to assign oformat, allows returning the correct error code and allocates priv_data Based on patch by: Mika Raento <mika.raento@elisa.fi> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | segment: don't access outside seg->frames arrayMika Raento2014-09-021-1/+1
| | | | | | | | | | | | Fixes wrong number of segments output and undefined memory access. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: re-interleave packets if neededMichael Niedermayer2014-07-241-1/+1
| | | | | | | | | | | | Fixes part of Ticket 3797 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: support re-interleaving packets in ff_write_chained()Michael Niedermayer2014-07-241-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/segment: sanitize segment end time in case last packet do not have a ↵Stefano Sabatini2014-07-221-0/+6
| | | | | | | | | | | | | | | | defined duration In particular, avoids to set segments with duration set to 0 (e.g. segment with a single reference frame for which duration is undefined).
* | lavf/segment: do not allow to create segments with no key-framesStefano Sabatini2014-07-221-8/+9
| | | | | | | | Fix trac ticket #3749.
* | lavf/segment: set segment end time when the first packet arrivesStefano Sabatini2014-07-171-0/+2
| | | | | | | | | | | | Avoid negative durations in case there is a single packet in the current segment, since in that case the end time is still set to the previous segment end time.
* | lavf/segment: fix weird indentStefano Sabatini2014-07-171-4/+4
| |
* | lavf/segment: show incoming packet duration in debug messageStefano Sabatini2014-07-171-1/+2
| |
* | lavf/segment: only use reference frames for computing the segment end timeStefano Sabatini2014-07-171-1/+1
| | | | | | | | | | | | | | This avoids a systematic overestimate of the segments duration when there are several streams. Fix trac ticket #3724.
* | libavformat/segment: change segment_list_size behavior to match ↵Simon Thelen2014-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hls_list_size behavior. Make the segment muxer keep segment_list_size segments instead of segment_list_size + 1 segments. This patch also changes the documentation for segment_list_size to reduce possible confusion over how many segments are kept. this allows the segment list to be limited to containing only one segment which used to be impossible because a segment_list_size of 0 kept all the segments and a segment_list_size of 1 kept 2 segments. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: remove gettimeofday() use, remove sys/time.hMichael Niedermayer2014-07-081-6/+6
| | | | | | | | | | | | | | It causes portability issues, and would need ifdef hell if its kept Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: simplify localtime* useMichael Niedermayer2014-07-071-7/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: Support cutting at clocktimeDeti fliegl2014-07-071-2/+35
| | | | | | | | | | Signed-off-by: Deti fliegl <fliegl@baycom.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: Use av_malloc_array()Michael Niedermayer2014-05-051-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'Michael Niedermayer2014-04-301-0/+3
|\| | | | | | | | | | | | | | | | | | | * commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818': segment: Report the current media sequence Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Report the current media sequenceLuca Barbato2014-04-301-0/+3
| | | | | | | | Useful for debugging mostly.
* | Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'Michael Niedermayer2014-04-291-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f': segment: Add an option to prepend a string to the list entries Conflicts: doc/muxers.texi libavformat/segment.c See: 5e278c19c752d65fdc1da1ceb599b091f71a4b4b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Add an option to prepend a string to the list entriesEnrique Arizón Benito2014-04-291-0/+5
| | | | | | | | | | | | Useful to generate lists with absolute urls. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * hls, segment: fix splitting for audio-only streams.Anton Khirnov2013-04-271-5/+7
| | | | | | | | CC:libav-stable@libav.org
| * segment: fix NULL pointer dereference in seg_write_header()Xi Wang2012-11-141-1/+1
| | | | | | | | | | | | | | | | Since the pointer `oc' is NULL, oc->oformat->name will cause a null pointer dereference. This patch changes it to seg->oformat->name. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/HLS: modified EXT-X-MEDIA-SEQUENCE header in order to follow the ↵Willy Aubry2014-03-031-1/+6
| | | | | | | | | | | | | | | | | | | | HLS standard When using the wrap option the EXT-X-MEDIA-SEQUENCE header of the playlist file was reset instead of being incremented. It is now incremented by one for every media URI removed from the playlist file as the standard states. Signed-off-by: Willy Aubry <waubry@viotech.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/segment: drop pointless variable oc from seg_write_packet()Stefano Sabatini2014-01-211-4/+1
| |
* | lavf/segment: remove duplicated and inconsistent cleanup code in ↵Stefano Sabatini2014-01-211-6/+0
| | | | | | | | | | | | | | | | seg_write_packet() In particular, avoid to leave around the seg->avf pointer to freed structure, and fix crash with: ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -f segment foo-%d.ts
* | lavf/segment: increase logging level for message with segment start informationStefano Sabatini2013-12-181-1/+1
| | | | | | | | Help debugging.
* | lavf/segment: add a few log messages when avio_open2() failsStefano Sabatini2013-11-251-3/+9
| |
* | lavf/segment: add segment_list_entry_prefix optionStefano Sabatini2013-11-251-2/+19
| | | | | | | | | | | | | | | | | | This option allows to add a prefix to the segment list entry filenames. Also set by default the list entry filenames to the corresponding segment basename, consistent with the HLS muxer. Based on an idea by Steven Liu <lingjiujianke@gmail.com>.
* | lavf/segment: simplify logic and fix !=0 check on segment_end return valueStefano Sabatini2013-10-151-5/+3
| | | | | | | | A successfull return value can be > 0.
* | lavf/segment: log segments as they end to AV_LOG_VERBOSEBilly Shambrook2013-10-151-0/+4
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavf/segment: simplify segment_count updateStefano Sabatini2013-10-151-6/+4
| | | | | | | | Now segment_count mark the segment_count of the current segment.
* | Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-301-4/+4
| |
* | lavf/segment: use AV_OPT_TIME_DURATION for time_deltaStefano Sabatini2013-07-111-11/+1
| | | | | | | | Simplify.
* | lavf/segment: reindent after last commitStefano Sabatini2013-07-111-18/+17
| |
* | lavf/segment: add initial_offset optionStefano Sabatini2013-07-111-5/+9
| | | | | | | | Should address trac ticket #2224.
* | segment: copy metadataMichael Niedermayer2013-03-181-0/+1
| | | | | | | | | | | | Fixes Ticket2230 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/segment: add support to ffconcat segment listStefano Sabatini2013-03-071-3/+21
| |
* | lavf/segment: fix DTS inconsistencies with -reset_timestampsStefano Sabatini2013-02-061-6/+3
| | | | | | | | | | | | | | | | | | | | | | The DTS needs to be resynched against the segment start PTS, or the resulting DTS may result < PTS. Reported-by: Owen Jones <riots6@gmail.com> See thread: Subject: [FFmpeg-user] pts/dts error using reset_timestamps while splitting a DVD Date: Sat, 19 Jan 2013 08:58:27 +0000
* | lavf/segment: extend PTS debugging log with -reset_timestampsStefano Sabatini2013-02-061-5/+9
| |
* | lavf/segment: use correct spelling and value for EXT-X-ALLOW-CACHE tagCarl Eugen Hoyos2013-02-031-2/+2
| | | | | | | | | | | | | | | | | | Replace wrong "EXT-X-ALLOWCACHE" with "EXT-X-ALLOW-CACHE", and value 1/0 with YES/NO, as per spec. Fix trac ticket #2228. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavf/segment: exit immediately in case of invalid stream specifierStefano Sabatini2013-01-231-1/+1
| | | | | | | | | | Avoid duplicated confusing error message, and propagate error code from the failing avformat_match_stream_specifier() call.